diff options
Diffstat (limited to 'devel')
114 files changed, 2235 insertions, 1797 deletions
diff --git a/devel/Makefile b/devel/Makefile index 8f16541a5020..1d68a05890ad 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -447,6 +447,7 @@ SUBDIR += gob2 SUBDIR += goffice SUBDIR += goffice04 + SUBDIR += goffice06 SUBDIR += goffice1 SUBDIR += gonzui SUBDIR += google-perftools diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index d16450f8db45..bc12266f36ca 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -3,15 +3,14 @@ # Whom: Chia-liang Kao <clkao@CirX.ORG> # # $FreeBSD$ -# $MCom: ports/devel/ORBit2/Makefile,v 1.50 2006/04/13 07:52:31 bland Exp $ +# $MCom: ports/devel/ORBit2/Makefile,v 1.53 2008/09/21 06:32:52 kwm Exp $ # PORTNAME= ORBit2 -PORTVERSION= 2.14.14 +PORTVERSION= 2.14.16 PORTREVISION?= 0 CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -25,8 +24,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack libidl ltverhack referencehack -CONFIGURE_ARGS= --disable-indent \ - --with-html-dir=${PREFIX}/share/doc \ +CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index 7799542881d1..6785eb3255a5 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/ORBit2-2.14.14.tar.bz2) = f288e9a4354fce14cf6bb35140ac5d9b -SHA256 (gnome2/ORBit2-2.14.14.tar.bz2) = 3b224f78dcebf8f91a832a40021b78cd32267453155b17a134df7ce3f6784ab1 -SIZE (gnome2/ORBit2-2.14.14.tar.bz2) = 739599 +MD5 (gnome2/ORBit2-2.14.16.tar.bz2) = f4898b999f39c79d55c13c0e0f597c71 +SHA256 (gnome2/ORBit2-2.14.16.tar.bz2) = e7bc69a316e6e2a263987a0aec5c6249dc152361e9559b4818a680681409aac1 +SIZE (gnome2/ORBit2-2.14.16.tar.bz2) = 739458 diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index 8dc8e3ed4495..b058243de6e6 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -3,12 +3,12 @@ # Whom: Dmitry Sivachenko <demon@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/anjuta/Makefile,v 1.22 2008/03/11 03:52:48 marcus Exp $ +# $MCom: ports/devel/anjuta/Makefile,v 1.32 2008/11/27 02:17:34 marcus Exp $ # PORTNAME= anjuta -PORTVERSION= 2.4.2 -PORTREVISION= 2 +PORTVERSION= 2.24.2 +PORTREVISION= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +20,7 @@ BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \ bash:${PORTSDIR}/shells/bash \ neato:${PORTSDIR}/graphics/graphviz LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ - gbf-1.1:${PORTSDIR}/devel/gnome-build \ + gbf-1.2:${PORTSDIR}/devel/gnome-build \ gladeui-1.7:${PORTSDIR}/devel/glade3 \ neon.28:${PORTSDIR}/www/neon28 \ devhelp-1.0:${PORTSDIR}/devel/devhelp @@ -36,17 +36,14 @@ USE_GMAKE= yes USE_GETTEXT= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack libgnomeprintui libgnomeui vte \ - gtksourceview2 +USE_GNOME= gnomeprefix gnomehack libgnomeui vte gtksourceview2 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --enable-plugin-symbol-db USE_LDCONFIG= yes -PKGMESSAGE= ${WRKDIR}/pkg-message GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \ anjuta-cvs-plugin.schemas anjuta-document-manager.schemas \ - anjuta-editor-scintilla.schemas anjuta-language-cpp-java.schemas \ + anjuta-language-cpp-java.schemas \ anjuta-message-manager-plugin.schemas \ anjuta-editor-sourceview.schemas \ anjuta-symbol-browser-plugin.schemas \ @@ -54,7 +51,9 @@ GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \ MAN1= anjuta.1 anjuta_launcher.1 -OPTIONS= SVN "Build subversion plugins" off +OPTIONS= SVN "Build subversion plugin" off \ + SYMBOL "Build experimental symbol-db plugin" off \ + SCINTILLA "Build scintilla plugin" off .include <bsd.port.pre.mk> @@ -74,14 +73,34 @@ CONFIGURE_ARGS+=--disable-plugin-subversion PLIST_SUB+= SVN="@comment " .endif +.if defined(WITH_SCINTILLA) +USE_GNOME+= libgnomeprintui +CONFIGURE_ARGS+=--enable-plugin-scintilla +GCONF_SCHEMAS+= anjuta-editor-scintilla.schemas +PLIST_SUB+= SCINTILLA="" +.else +#CONFIGURE_ARGS+=--disable-plugin-scintilla +PLIST_SUB+= SCINTILLA="@comment " +.endif + +.if defined(WITH_SYMBOL) +USE_GNOME+= libgda4 +CONFIGURE_ARGS+=--enable-plugin-symbol-db +GCONF_SCHEMAS+= anjuta-symbol-db.schemas +PLIST_SUB+= SYMBOL="" +.else +CONFIGURE_ARGS+=--disable-plugin-symbol-db +PLIST_SUB+= SYMBOL="@comment " +.endif + post-configure: @${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash| ; \ s|/usr/local|${PREFIX}|' \ ${WRKSRC}/global-tags/create_global_tags.sh.in @${REINPLACE_CMD} -e 's|PKG_PATH|PKG_CONFIG_PATH|g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|make|gmake|g' \ - ${WRKSRC}/plugins/build-basic-autotools/build-basic-autotools.c + @${REINPLACE_CMD} -e 's|"make|"gmake|g' \ + ${WRKSRC}/plugins/build-basic-autotools/plugin.c post-install: .if !defined(NOPORTDOCS) diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo index 6e77ef47153b..aa83de8919c7 100644 --- a/devel/anjuta/distinfo +++ b/devel/anjuta/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/anjuta-2.4.2.tar.bz2) = 66dc5a9aeb051846f82715b1bed55e37 -SHA256 (gnome2/anjuta-2.4.2.tar.bz2) = 217e49d8f1d8ac06607166bb7c6b3797e692e5a387f973efb40260ab362693c9 -SIZE (gnome2/anjuta-2.4.2.tar.bz2) = 6369144 +MD5 (gnome2/anjuta-2.24.2.tar.bz2) = d1db75bc1c8d4ab4c9d180767e24e39a +SHA256 (gnome2/anjuta-2.24.2.tar.bz2) = 7b60753b98a12c5ae85b7fee126d280385ac67dd94a855ab50c17de862df6c68 +SIZE (gnome2/anjuta-2.24.2.tar.bz2) = 6713913 diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in index 1451a0d3ba41..132cd27555dd 100644 --- a/devel/anjuta/files/patch-Makefile.in +++ b/devel/anjuta/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2008-04-07 18:57:45.000000000 -0400 -+++ Makefile.in 2008-04-07 18:58:11.000000000 -0400 -@@ -522,14 +522,14 @@ uninstall-anjuta_dataDATA: +--- Makefile.in.orig 2008-09-22 14:17:35.000000000 -0400 ++++ Makefile.in 2008-09-22 14:20:32.000000000 -0400 +@@ -505,14 +505,14 @@ uninstall-anjuta_dataDATA: rm -f "$(DESTDIR)$(anjuta_datadir)/$$f"; \ done install-anjutadocDATA: $(anjutadoc_DATA) - @$(NORMAL_INSTALL) -- test -z "$(anjutadocdir)" || $(mkdir_p) "$(DESTDIR)$(anjutadocdir)" +- test -z "$(anjutadocdir)" || $(MKDIR_P) "$(DESTDIR)$(anjutadocdir)" - @list='$(anjutadoc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ @@ -13,7 +13,7 @@ - $(anjutadocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjutadocdir)/$$f"; \ - done +# @$(NORMAL_INSTALL) -+# test -z "$(anjutadocdir)" || $(mkdir_p) "$(DESTDIR)$(anjutadocdir)" ++# test -z "$(anjutadocdir)" || $(MKDIR_P) "$(DESTDIR)$(anjutadocdir)" +# @list='$(anjutadoc_DATA)'; for p in $$list; do \ +# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +# f=$(am__strip_dir) \ diff --git a/devel/anjuta/files/patch-doc::Makefile.in b/devel/anjuta/files/patch-doc::Makefile.in index aac2a1bf2cae..a567fda3389c 100644 --- a/devel/anjuta/files/patch-doc::Makefile.in +++ b/devel/anjuta/files/patch-doc::Makefile.in @@ -1,25 +1,11 @@ ---- doc/Makefile.in.orig 2008-04-07 18:58:53.000000000 -0400 -+++ doc/Makefile.in 2008-04-07 18:59:30.000000000 -0400 -@@ -472,14 +472,14 @@ uninstall-man1: - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done - install-anjuta_docDATA: $(anjuta_doc_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(anjuta_docdir)" || $(mkdir_p) "$(DESTDIR)$(anjuta_docdir)" -- @list='$(anjuta_doc_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(anjuta_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjuta_docdir)/$$f'"; \ -- $(anjuta_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjuta_docdir)/$$f"; \ -- done -+# @$(NORMAL_INSTALL) -+# test -z "$(anjuta_docdir)" || $(mkdir_p) "$(DESTDIR)$(anjuta_docdir)" -+# @list='$(anjuta_doc_DATA)'; for p in $$list; do \ -+# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+# f=$(am__strip_dir) \ -+# echo " $(anjuta_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjuta_docdir)/$$f'"; \ -+# $(anjuta_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjuta_docdir)/$$f"; \ -+# done +--- doc/Makefile.in.orig 2008-08-06 17:40:26.000000000 +0200 ++++ doc/Makefile.in 2008-08-06 17:41:04.000000000 +0200 +@@ -540,7 +540,7 @@ + + info-am: + +-install-data-am: install-anjuta_docDATA install-man ++install-data-am: install-man + + install-dvi: install-dvi-am - uninstall-anjuta_docDATA: - @$(NORMAL_UNINSTALL) diff --git a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c index 1c7679ab2b95..0235ff1e8d24 100644 --- a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c +++ b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c @@ -1,15 +1,6 @@ ---- libanjuta/anjuta-launcher.c.orig 2008-02-15 18:32:29.000000000 -0500 -+++ libanjuta/anjuta-launcher.c 2008-02-25 22:45:03.000000000 -0500 -@@ -37,7 +37,7 @@ - #include <signal.h> - - #if !defined(__sun) && !defined(__NetBSD__) --# ifndef FREEBSD -+# if !defined(__FreeBSD__) - # include <pty.h> - # else - # include <libutil.h> -@@ -749,7 +749,8 @@ anjuta_launcher_scan_output (GIOChannel +--- libanjuta/anjuta-launcher.c.orig 2008-05-29 22:37:02.000000000 +0200 ++++ libanjuta/anjuta-launcher.c 2008-06-05 16:12:17.000000000 +0200 +@@ -761,7 +761,8 @@ anjuta_launcher_scan_output (GIOChannel GError *err = NULL; do { @@ -18,8 +9,8 @@ + status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); if (n > 0) /* There is output */ { - gchar *utf8_chars; -@@ -776,6 +777,13 @@ anjuta_launcher_scan_output (GIOChannel + gchar *utf8_chars = NULL; +@@ -789,6 +790,13 @@ anjuta_launcher_scan_output (GIOChannel anjuta_launcher_synchronize (launcher); ret = FALSE; } @@ -33,7 +24,7 @@ /* Read next chars if buffer was too small * (the maximum length of one character is 6 bytes) */ } while (!err && (n > FILE_BUFFER_SIZE - 7)); -@@ -805,7 +813,8 @@ anjuta_launcher_scan_error (GIOChannel * +@@ -818,7 +826,8 @@ anjuta_launcher_scan_error (GIOChannel * GError *err = NULL; do { @@ -43,7 +34,7 @@ if (n > 0) /* There is stderr output */ { gchar *utf8_chars; -@@ -833,6 +842,13 @@ anjuta_launcher_scan_error (GIOChannel * +@@ -844,6 +853,13 @@ anjuta_launcher_scan_error (GIOChannel * anjuta_launcher_synchronize (launcher); ret = FALSE; } @@ -57,7 +48,7 @@ /* Read next chars if buffer was too small * (the maximum length of one character is 6 bytes) */ } while (!err && (n > FILE_BUFFER_SIZE - 7)); -@@ -862,7 +878,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch +@@ -873,7 +889,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch GError *err = NULL; do { @@ -67,8 +58,8 @@ if (n > 0) /* There is stderr output */ { gchar *utf8_chars; -@@ -893,6 +910,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch - g_warning ("pty: %s", err->message); +@@ -902,6 +919,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch + { ret = FALSE; } + else if (status == G_IO_STATUS_EOF) diff --git a/devel/anjuta/files/patch-scripts::anjuta_import.sh.in b/devel/anjuta/files/patch-scripts::anjuta_import.sh.in deleted file mode 100644 index 94b1413d60db..000000000000 --- a/devel/anjuta/files/patch-scripts::anjuta_import.sh.in +++ /dev/null @@ -1,8 +0,0 @@ ---- scripts/anjuta_import.sh.in.orig Wed May 14 16:09:42 2003 -+++ scripts/anjuta_import.sh.in Wed May 14 16:11:15 2003 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # Shell script to automatically create an Anjuta 1.x project file - # Copyright: Biswapesh Chattopadhyay (biswapesh_chatterjee@tcscal.co.in) 2001-2002 diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist index d27734a81085..7aef13fece46 100644 --- a/devel/anjuta/pkg-plist +++ b/devel/anjuta/pkg-plist @@ -3,12 +3,14 @@ bin/anjuta_import.sh bin/anjuta_launcher include/libanjuta-1.0/libanjuta/anjuta-async-command.h include/libanjuta-1.0/libanjuta/anjuta-command.h +include/libanjuta-1.0/libanjuta/anjuta-convert.h include/libanjuta-1.0/libanjuta/anjuta-debug.h include/libanjuta-1.0/libanjuta/anjuta-encodings.h include/libanjuta-1.0/libanjuta/anjuta-enum-types.h include/libanjuta-1.0/libanjuta/anjuta-error.h include/libanjuta-1.0/libanjuta/anjuta-launcher.h include/libanjuta-1.0/libanjuta/anjuta-marshal.h +include/libanjuta-1.0/libanjuta/anjuta-message-area.h include/libanjuta-1.0/libanjuta/anjuta-plugin-description.h include/libanjuta-1.0/libanjuta/anjuta-plugin-handle.h include/libanjuta-1.0/libanjuta/anjuta-plugin-manager.h @@ -22,11 +24,14 @@ include/libanjuta-1.0/libanjuta/anjuta-serializer.h include/libanjuta-1.0/libanjuta/anjuta-session.h include/libanjuta-1.0/libanjuta/anjuta-shell.h include/libanjuta-1.0/libanjuta/anjuta-status.h +include/libanjuta-1.0/libanjuta/anjuta-sync-command.h include/libanjuta-1.0/libanjuta/anjuta-ui.h include/libanjuta-1.0/libanjuta/anjuta-utils.h include/libanjuta-1.0/libanjuta/anjuta-vcs-status-tree-view.h +include/libanjuta-1.0/libanjuta/anjuta-version.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-bookmark.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-buildable.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-builder.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debug-manager.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-breakpoint.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-instruction.h @@ -52,6 +57,7 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-selection.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-view.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-zoom.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-environment.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-file-loader.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-file-manager.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-file-savable.h @@ -92,7 +98,7 @@ lib/anjuta/anjuta-cvs.plugin lib/anjuta/anjuta-debug-manager.plugin lib/anjuta/anjuta-devhelp.plugin lib/anjuta/anjuta-document-manager.plugin -lib/anjuta/anjuta-editor.plugin +%%SCINTILLA%%lib/anjuta/anjuta-editor.plugin lib/anjuta/anjuta-file-wizard.plugin lib/anjuta/anjuta-gdb.plugin lib/anjuta/anjuta-glade.plugin @@ -105,13 +111,17 @@ lib/anjuta/anjuta-patch.plugin lib/anjuta/anjuta-project-import.plugin lib/anjuta/anjuta-project-manager.plugin lib/anjuta/anjuta-project-wizard.plugin +lib/anjuta/anjuta-run-program.plugin lib/anjuta/anjuta-sample.plugin +lib/anjuta/anjuta-scratchbox.plugin lib/anjuta/anjuta-search.plugin %%SVN%%lib/anjuta/anjuta-subversion.plugin lib/anjuta/anjuta-symbol-browser.plugin +lib/anjuta/anjuta-tags lib/anjuta/anjuta-terminal.plugin lib/anjuta/anjuta-tools.plugin lib/anjuta/file-manager.plugin +lib/anjuta/git.plugin lib/anjuta/language-manager.plugin lib/anjuta/libanjuta-build-basic-autotools.la lib/anjuta/libanjuta-build-basic-autotools.so @@ -127,12 +137,14 @@ lib/anjuta/libanjuta-devhelp.la lib/anjuta/libanjuta-devhelp.so lib/anjuta/libanjuta-document-manager.la lib/anjuta/libanjuta-document-manager.so -lib/anjuta/libanjuta-editor.la -lib/anjuta/libanjuta-editor.so +%%SCINTILLA%%lib/anjuta/libanjuta-editor.la +%%SCINTILLA%%lib/anjuta/libanjuta-editor.so lib/anjuta/libanjuta-file-wizard.la lib/anjuta/libanjuta-file-wizard.so lib/anjuta/libanjuta-gdb.la lib/anjuta/libanjuta-gdb.so +lib/anjuta/libanjuta-git.la +lib/anjuta/libanjuta-git.so lib/anjuta/libanjuta-glade.la lib/anjuta/libanjuta-glade.so lib/anjuta/libanjuta-gtodo.la @@ -155,8 +167,12 @@ lib/anjuta/libanjuta-project-manager.la lib/anjuta/libanjuta-project-manager.so lib/anjuta/libanjuta-project-wizard.la lib/anjuta/libanjuta-project-wizard.so +lib/anjuta/libanjuta-run-program.la +lib/anjuta/libanjuta-run-program.so lib/anjuta/libanjuta-sample.la lib/anjuta/libanjuta-sample.so +lib/anjuta/libanjuta-scratchbox.la +lib/anjuta/libanjuta-scratchbox.so lib/anjuta/libanjuta-search.la lib/anjuta/libanjuta-search.so lib/anjuta/libanjuta-sourceview.la @@ -165,6 +181,8 @@ lib/anjuta/libanjuta-sourceview.so %%SVN%%lib/anjuta/libanjuta-subversion.so lib/anjuta/libanjuta-symbol-browser.la lib/anjuta/libanjuta-symbol-browser.so +%%SYMBOL%%lib/anjuta/libanjuta-symbol-db.la +%%SYMBOL%%lib/anjuta/libanjuta-symbol-db.so lib/anjuta/libanjuta-terminal.la lib/anjuta/libanjuta-terminal.so lib/anjuta/libanjuta-tools.la @@ -174,17 +192,14 @@ lib/anjuta/libfile-manager.so lib/anjuta/libfile-manager.so.0 lib/anjuta/liblanguage-manager.la lib/anjuta/liblanguage-manager.so -lib/anjuta/liblanguage-manager.so.0 lib/anjuta/profiler.plugin lib/anjuta/sourceview.plugin +%%SYMBOL%%lib/anjuta/symbol-db.plugin lib/glade3/modules/libgladeanjuta.la lib/glade3/modules/libgladeanjuta.so lib/libanjuta-ctags.la lib/libanjuta-ctags.so lib/libanjuta-ctags.so.0 -lib/libanjuta-egg.la -lib/libanjuta-egg.so -lib/libanjuta-egg.so.0 lib/libanjuta.la lib/libanjuta.so lib/libanjuta.so.0 @@ -202,25 +217,27 @@ share/anjuta/glade/anjuta-class-gen-plugin.glade share/anjuta/glade/anjuta-cvs-plugin.glade share/anjuta/glade/anjuta-debug-manager.glade share/anjuta/glade/anjuta-document-manager.glade -share/anjuta/glade/anjuta-editor-scintilla.glade +%%SCINTILLA%%share/anjuta/glade/anjuta-editor-scintilla.glade share/anjuta/glade/anjuta-editor-sourceview.glade share/anjuta/glade/anjuta-file-wizard.glade share/anjuta/glade/anjuta-gdb.glade +share/anjuta/glade/anjuta-git.glade share/anjuta/glade/anjuta-language-cpp-java.glade share/anjuta/glade/anjuta-macro.glade share/anjuta/glade/anjuta-message-manager-plugin.glade -share/anjuta/glade/anjuta-project-import.glade share/anjuta/glade/anjuta-project-wizard.glade +share/anjuta/glade/anjuta-run-program.glade +share/anjuta/glade/anjuta-scratchbox.glade share/anjuta/glade/anjuta-search.glade %%SVN%%share/anjuta/glade/anjuta-subversion.glade share/anjuta/glade/anjuta-symbol-browser-plugin.glade +%%SYMBOL%%share/anjuta/glade/anjuta-symbol-db.glade share/anjuta/glade/anjuta-terminal-plugin.glade share/anjuta/glade/anjuta-tools.glade share/anjuta/glade/anjuta.glade share/anjuta/glade/applogo.png share/anjuta/glade/appwizard.png share/anjuta/glade/file-manager.glade -share/anjuta/glade/layout.glade share/anjuta/glade/patch-plugin.glade share/anjuta/glade/profiler-call-graph.glade share/anjuta/glade/profiler-flat-profile.glade @@ -245,6 +262,12 @@ share/anjuta/project/anjuta-plugin/src/plugin.glade share/anjuta/project/anjuta-plugin/src/plugin.h share/anjuta/project/anjuta-plugin/src/plugin.plugin.in share/anjuta/project/anjuta-plugin/src/plugin.ui +share/anjuta/project/anjuta-plugin-vala.wiz +share/anjuta/project/anjuta-plugin-vala/configure.ac.tpl +share/anjuta/project/anjuta-plugin-vala/po/POTFILES.in +share/anjuta/project/anjuta-plugin-vala/src/Makefile.am.tpl +share/anjuta/project/anjuta-plugin-vala/src/config.vapi +share/anjuta/project/anjuta-plugin-vala/src/plugin.vala share/anjuta/project/appwiz_sdl.png share/anjuta/project/cpp-logo.png share/anjuta/project/cpp.wiz @@ -288,6 +311,10 @@ share/anjuta/project/java/po/POTFILES.in share/anjuta/project/java/project.anjuta share/anjuta/project/java/src/Makefile.am.tpl share/anjuta/project/java/src/main.java +share/anjuta/project/licenses/BSD +share/anjuta/project/licenses/GPL +share/anjuta/project/licenses/LGPL +share/anjuta/project/licenses/None share/anjuta/project/minimal.wiz share/anjuta/project/minimal/Makefile.am.tpl share/anjuta/project/minimal/autogen.sh @@ -350,55 +377,56 @@ share/anjuta/project/xlib/configure.ac.tpl share/anjuta/project/xlib/po/POTFILES.in share/anjuta/project/xlib/src/Makefile.am.tpl share/anjuta/project/xlib/src/main.c -share/anjuta/properties/Embedded.properties -share/anjuta/properties/SciTEGlobal.properties -share/anjuta/properties/ada.properties -share/anjuta/properties/anjuta.properties -share/anjuta/properties/asm.properties -share/anjuta/properties/asn1.properties -share/anjuta/properties/au3.properties -share/anjuta/properties/ave.properties -share/anjuta/properties/baan.properties -share/anjuta/properties/bullant.properties -share/anjuta/properties/conf.properties -share/anjuta/properties/cpp.properties -share/anjuta/properties/css.properties -share/anjuta/properties/eiffel.properties -share/anjuta/properties/erlang.properties -share/anjuta/properties/escript.properties -share/anjuta/properties/forth.properties -share/anjuta/properties/fortran.properties -share/anjuta/properties/html.properties -share/anjuta/properties/kix.properties -share/anjuta/properties/latex.properties -share/anjuta/properties/lisp.properties -share/anjuta/properties/lot.properties -share/anjuta/properties/lout.properties -share/anjuta/properties/lua.properties -share/anjuta/properties/matlab.properties -share/anjuta/properties/metapost.properties -share/anjuta/properties/mmixal.properties -share/anjuta/properties/nncrontab.properties -share/anjuta/properties/nsis.properties -share/anjuta/properties/others.properties -share/anjuta/properties/pascal.properties -share/anjuta/properties/perl.properties -share/anjuta/properties/pov.properties -share/anjuta/properties/ps.properties -share/anjuta/properties/python.properties -share/anjuta/properties/ruby.properties -share/anjuta/properties/scriptol.properties -share/anjuta/properties/specman.properties -share/anjuta/properties/sql.properties -share/anjuta/properties/styles.properties -share/anjuta/properties/tcl.properties -share/anjuta/properties/tex.properties -share/anjuta/properties/user.properties -share/anjuta/properties/vb.properties -share/anjuta/properties/verilog.properties -share/anjuta/properties/vhdl.properties -share/anjuta/properties/yaml.properties +%%SCINTILLA%%share/anjuta/properties/Embedded.properties +%%SCINTILLA%%share/anjuta/properties/SciTEGlobal.properties +%%SCINTILLA%%share/anjuta/properties/ada.properties +%%SCINTILLA%%share/anjuta/properties/anjuta.properties +%%SCINTILLA%%share/anjuta/properties/asm.properties +%%SCINTILLA%%share/anjuta/properties/asn1.properties +%%SCINTILLA%%share/anjuta/properties/au3.properties +%%SCINTILLA%%share/anjuta/properties/ave.properties +%%SCINTILLA%%share/anjuta/properties/baan.properties +%%SCINTILLA%%share/anjuta/properties/bullant.properties +%%SCINTILLA%%share/anjuta/properties/conf.properties +%%SCINTILLA%%share/anjuta/properties/cpp.properties +%%SCINTILLA%%share/anjuta/properties/css.properties +%%SCINTILLA%%share/anjuta/properties/eiffel.properties +%%SCINTILLA%%share/anjuta/properties/erlang.properties +%%SCINTILLA%%share/anjuta/properties/escript.properties +%%SCINTILLA%%share/anjuta/properties/forth.properties +%%SCINTILLA%%share/anjuta/properties/fortran.properties +%%SCINTILLA%%share/anjuta/properties/html.properties +%%SCINTILLA%%share/anjuta/properties/kix.properties +%%SCINTILLA%%share/anjuta/properties/latex.properties +%%SCINTILLA%%share/anjuta/properties/lisp.properties +%%SCINTILLA%%share/anjuta/properties/lot.properties +%%SCINTILLA%%share/anjuta/properties/lout.properties +%%SCINTILLA%%share/anjuta/properties/lua.properties +%%SCINTILLA%%share/anjuta/properties/matlab.properties +%%SCINTILLA%%share/anjuta/properties/metapost.properties +%%SCINTILLA%%share/anjuta/properties/mmixal.properties +%%SCINTILLA%%share/anjuta/properties/nncrontab.properties +%%SCINTILLA%%share/anjuta/properties/nsis.properties +%%SCINTILLA%%share/anjuta/properties/others.properties +%%SCINTILLA%%share/anjuta/properties/pascal.properties +%%SCINTILLA%%share/anjuta/properties/perl.properties +%%SCINTILLA%%share/anjuta/properties/pov.properties +%%SCINTILLA%%share/anjuta/properties/ps.properties +%%SCINTILLA%%share/anjuta/properties/python.properties +%%SCINTILLA%%share/anjuta/properties/ruby.properties +%%SCINTILLA%%share/anjuta/properties/scriptol.properties +%%SCINTILLA%%share/anjuta/properties/specman.properties +%%SCINTILLA%%share/anjuta/properties/sql.properties +%%SCINTILLA%%share/anjuta/properties/styles.properties +%%SCINTILLA%%share/anjuta/properties/tcl.properties +%%SCINTILLA%%share/anjuta/properties/tex.properties +%%SCINTILLA%%share/anjuta/properties/user.properties +%%SCINTILLA%%share/anjuta/properties/vb.properties +%%SCINTILLA%%share/anjuta/properties/verilog.properties +%%SCINTILLA%%share/anjuta/properties/vhdl.properties +%%SCINTILLA%%share/anjuta/properties/yaml.properties share/anjuta/scripts/create_global_tags.sh +%%SYMBOL%%share/anjuta/tables.sql share/anjuta/tools/find-fixmes.pl share/anjuta/tools/prepare-changelog.pl share/anjuta/tools/tools-2.xml @@ -409,6 +437,7 @@ share/anjuta/ui/anjuta-debug-manager.ui share/anjuta/ui/anjuta-devhelp-simple.ui share/anjuta/ui/anjuta-devhelp.ui share/anjuta/ui/anjuta-document-manager.ui +share/anjuta/ui/anjuta-git.ui share/anjuta/ui/anjuta-glade.ui share/anjuta/ui/anjuta-gtodo.ui share/anjuta/ui/anjuta-language-support-cpp-java.ui @@ -417,10 +446,12 @@ share/anjuta/ui/anjuta-macro.ui share/anjuta/ui/anjuta-message-manager.ui share/anjuta/ui/anjuta-patch.ui share/anjuta/ui/anjuta-project-manager.ui +share/anjuta/ui/anjuta-run-program.ui share/anjuta/ui/anjuta-sample.ui share/anjuta/ui/anjuta-search.ui %%SVN%%share/anjuta/ui/anjuta-subversion.ui share/anjuta/ui/anjuta-symbol-browser-plugin.ui +share/anjuta/ui/anjuta-terminal-plugin.ui share/anjuta/ui/anjuta-tools.ui share/anjuta/ui/anjuta.ui share/anjuta/ui/file-manager.ui @@ -436,7 +467,11 @@ share/applications/anjuta.desktop %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/ScintillaDoc.html %%PORTDOCS%%%%DOCSDIR%%/TODO +share/doc/libanjuta/AnjutaAsyncCommand.html +share/doc/libanjuta/AnjutaCellRendererCaptionedImage.html +share/doc/libanjuta/AnjutaCommand.html share/doc/libanjuta/AnjutaLauncher.html +share/doc/libanjuta/AnjutaMessageArea.html share/doc/libanjuta/AnjutaPlugin.html share/doc/libanjuta/AnjutaPluginHandle.html share/doc/libanjuta/AnjutaPluginManager.html @@ -448,6 +483,8 @@ share/doc/libanjuta/AnjutaSavePrompt.html share/doc/libanjuta/AnjutaSerializer.html share/doc/libanjuta/AnjutaSession.html share/doc/libanjuta/AnjutaStatus.html +share/doc/libanjuta/AnjutaSyncCommand.html +share/doc/libanjuta/AnjutaVcsStatusTreeView.html share/doc/libanjuta/AnjutaUI.html share/doc/libanjuta/action-block.html share/doc/libanjuta/anjuta-architecture.html @@ -458,10 +495,10 @@ share/doc/libanjuta/home.png share/doc/libanjuta/index.html share/doc/libanjuta/index.sgml share/doc/libanjuta/left.png -share/doc/libanjuta/libanjuta-AnjutaCellRendererCaptionedImage.html share/doc/libanjuta/libanjuta-ESplash.html share/doc/libanjuta/libanjuta-anjuta-c-module.html share/doc/libanjuta/libanjuta-anjuta-c-plugin-factory.html +share/doc/libanjuta/libanjuta-anjuta-convert.html share/doc/libanjuta/libanjuta-anjuta-debug.html share/doc/libanjuta/libanjuta-anjuta-encodings.html share/doc/libanjuta/libanjuta-anjuta-enum-types.html @@ -471,11 +508,14 @@ share/doc/libanjuta/libanjuta-anjuta-plugin-description.html share/doc/libanjuta/libanjuta-anjuta-shell.html share/doc/libanjuta/libanjuta-anjuta-utils-priv.html share/doc/libanjuta/libanjuta-anjuta-utils.html +share/doc/libanjuta/libanjuta-anjuta-version.html share/doc/libanjuta/libanjuta-api.html share/doc/libanjuta/libanjuta-ianjuta-bookmark.html share/doc/libanjuta/libanjuta-ianjuta-buildable.html +share/doc/libanjuta/libanjuta-ianjuta-builder.html share/doc/libanjuta/libanjuta-ianjuta-debug-manager.html share/doc/libanjuta/libanjuta-ianjuta-debugger-breakpoint.html +share/doc/libanjuta/libanjuta-ianjuta-environment.html share/doc/libanjuta/libanjuta-ianjuta-debugger-instruction.html share/doc/libanjuta/libanjuta-ianjuta-debugger-memory.html share/doc/libanjuta/libanjuta-ianjuta-debugger-register.html @@ -515,7 +555,6 @@ share/doc/libanjuta/libanjuta-ianjuta-markable.html share/doc/libanjuta/libanjuta-ianjuta-message-manager.html share/doc/libanjuta/libanjuta-ianjuta-message-view.html share/doc/libanjuta/libanjuta-ianjuta-plugin-factory.html -share/doc/libanjuta/libanjuta-ianjuta-plugin-loader.html share/doc/libanjuta/libanjuta-ianjuta-preferences.html share/doc/libanjuta/libanjuta-ianjuta-print.html share/doc/libanjuta/libanjuta-ianjuta-project-manager.html @@ -550,10 +589,10 @@ share/gnome/help/anjuta-faqs/C/anjuta-faqs.xml share/gnome/help/anjuta-faqs/C/legal.xml share/gnome/help/anjuta-manual/C/anjuta-manual.xml share/gnome/help/anjuta-manual/C/authors.xml +share/gnome/help/anjuta-manual/C/build.xml share/gnome/help/anjuta-manual/C/debugger.xml share/gnome/help/anjuta-manual/C/figures/add_edit_macro.png share/gnome/help/anjuta-manual/C/figures/anjuta-in-action.png -share/gnome/help/anjuta-manual/C/figures/arguments.png share/gnome/help/anjuta-manual/C/figures/attach.png share/gnome/help/anjuta-manual/C/figures/brk_add.png share/gnome/help/anjuta-manual/C/figures/brk_dlg.png @@ -603,7 +642,6 @@ share/gnome/help/anjuta-manual/C/tools.xml share/gnome/help/anjuta-manual/es/anjuta-manual.xml share/gnome/help/anjuta-manual/es/figures/add_edit_macro.png share/gnome/help/anjuta-manual/es/figures/anjuta-in-action.png -share/gnome/help/anjuta-manual/es/figures/arguments.png share/gnome/help/anjuta-manual/es/figures/attach.png share/gnome/help/anjuta-manual/es/figures/brk_add.png share/gnome/help/anjuta-manual/es/figures/brk_dlg.png @@ -644,7 +682,6 @@ share/gnome/help/anjuta-manual/es/figures/tool-editor.png share/gnome/help/anjuta-manual/oc/anjuta-manual.xml share/gnome/help/anjuta-manual/oc/figures/add_edit_macro.png share/gnome/help/anjuta-manual/oc/figures/anjuta-in-action.png -share/gnome/help/anjuta-manual/oc/figures/arguments.png share/gnome/help/anjuta-manual/oc/figures/attach.png share/gnome/help/anjuta-manual/oc/figures/brk_add.png share/gnome/help/anjuta-manual/oc/figures/brk_dlg.png @@ -685,7 +722,6 @@ share/gnome/help/anjuta-manual/oc/figures/tool-editor.png share/gnome/help/anjuta-manual/sv/anjuta-manual.xml share/gnome/help/anjuta-manual/sv/figures/add_edit_macro.png share/gnome/help/anjuta-manual/sv/figures/anjuta-in-action.png -share/gnome/help/anjuta-manual/sv/figures/arguments.png share/gnome/help/anjuta-manual/sv/figures/attach.png share/gnome/help/anjuta-manual/sv/figures/brk_add.png share/gnome/help/anjuta-manual/sv/figures/brk_dlg.png @@ -745,6 +781,8 @@ share/locale/fi/LC_MESSAGES/anjuta.mo share/locale/fr/LC_MESSAGES/anjuta.mo share/locale/ga/LC_MESSAGES/anjuta.mo share/locale/gl/LC_MESSAGES/anjuta.mo +share/locale/gu/LC_MESSAGES/anjuta.mo +share/locale/he/LC_MESSAGES/anjuta.mo share/locale/hi/LC_MESSAGES/anjuta.mo share/locale/hr/LC_MESSAGES/anjuta.mo share/locale/hu/LC_MESSAGES/anjuta.mo @@ -756,6 +794,7 @@ share/locale/ko/LC_MESSAGES/anjuta.mo share/locale/lt/LC_MESSAGES/anjuta.mo share/locale/mk/LC_MESSAGES/anjuta.mo share/locale/ml/LC_MESSAGES/anjuta.mo +share/locale/mr/LC_MESSAGES/anjuta.mo share/locale/ms/LC_MESSAGES/anjuta.mo share/locale/nb/LC_MESSAGES/anjuta.mo share/locale/ne/LC_MESSAGES/anjuta.mo @@ -772,10 +811,12 @@ share/locale/sk/LC_MESSAGES/anjuta.mo share/locale/sl/LC_MESSAGES/anjuta.mo share/locale/sq/LC_MESSAGES/anjuta.mo share/locale/sr/LC_MESSAGES/anjuta.mo -share/locale/sr@Latn/LC_MESSAGES/anjuta.mo +share/locale/sr@latin/LC_MESSAGES/anjuta.mo share/locale/sv/LC_MESSAGES/anjuta.mo +share/locale/th/LC_MESSAGES/anjuta.mo share/locale/tr/LC_MESSAGES/anjuta.mo share/locale/uk/LC_MESSAGES/anjuta.mo +share/locale/vi/LC_MESSAGES/anjuta.mo share/locale/zh_CN/LC_MESSAGES/anjuta.mo share/locale/zh_HK/LC_MESSAGES/anjuta.mo share/locale/zh_TW/LC_MESSAGES/anjuta.mo @@ -785,46 +826,6 @@ share/omf/anjuta-manual/anjuta-manual-C.omf share/omf/anjuta-manual/anjuta-manual-es.omf share/omf/anjuta-manual/anjuta-manual-oc.omf share/omf/anjuta-manual/anjuta-manual-sv.omf -share/pixmaps/anjuta/Icons.16x16.Class -share/pixmaps/anjuta/Icons.16x16.Enum -share/pixmaps/anjuta/Icons.16x16.Event -share/pixmaps/anjuta/Icons.16x16.Field -share/pixmaps/anjuta/Icons.16x16.FormsDesigner.BringToFront -share/pixmaps/anjuta/Icons.16x16.FormsDesigner.SendToBack -share/pixmaps/anjuta/Icons.16x16.Interface -share/pixmaps/anjuta/Icons.16x16.InternalClass -share/pixmaps/anjuta/Icons.16x16.InternalDelegate -share/pixmaps/anjuta/Icons.16x16.InternalEnum -share/pixmaps/anjuta/Icons.16x16.InternalEvent -share/pixmaps/anjuta/Icons.16x16.InternalField -share/pixmaps/anjuta/Icons.16x16.InternalInterface -share/pixmaps/anjuta/Icons.16x16.InternalMethod -share/pixmaps/anjuta/Icons.16x16.InternalProperty -share/pixmaps/anjuta/Icons.16x16.InternalStruct -share/pixmaps/anjuta/Icons.16x16.Literal -share/pixmaps/anjuta/Icons.16x16.Method -share/pixmaps/anjuta/Icons.16x16.NameSpace -share/pixmaps/anjuta/Icons.16x16.PrivateClass -share/pixmaps/anjuta/Icons.16x16.PrivateDelegate -share/pixmaps/anjuta/Icons.16x16.PrivateEnum -share/pixmaps/anjuta/Icons.16x16.PrivateEvent -share/pixmaps/anjuta/Icons.16x16.PrivateField -share/pixmaps/anjuta/Icons.16x16.PrivateInterface -share/pixmaps/anjuta/Icons.16x16.PrivateMethod -share/pixmaps/anjuta/Icons.16x16.PrivateProperty -share/pixmaps/anjuta/Icons.16x16.PrivateStruct -share/pixmaps/anjuta/Icons.16x16.Property -share/pixmaps/anjuta/Icons.16x16.ProtectedClass -share/pixmaps/anjuta/Icons.16x16.ProtectedDelegate -share/pixmaps/anjuta/Icons.16x16.ProtectedEnum -share/pixmaps/anjuta/Icons.16x16.ProtectedEvent -share/pixmaps/anjuta/Icons.16x16.ProtectedField -share/pixmaps/anjuta/Icons.16x16.ProtectedInterface -share/pixmaps/anjuta/Icons.16x16.ProtectedMethod -share/pixmaps/anjuta/Icons.16x16.ProtectedProperty -share/pixmaps/anjuta/Icons.16x16.ProtectedStruct -share/pixmaps/anjuta/Icons.16x16.Reference -share/pixmaps/anjuta/Icons.16x16.Struct share/pixmaps/anjuta/anjuta-attach-16.png share/pixmaps/anjuta/anjuta-attach-24.png share/pixmaps/anjuta/anjuta-block-end-16.png @@ -868,8 +869,19 @@ share/pixmaps/anjuta/anjuta-devhelp-plugin-48.png share/pixmaps/anjuta/anjuta-devhelp-plugin.svg share/pixmaps/anjuta/anjuta-document-manager-plugin-48.png share/pixmaps/anjuta/anjuta-document-manager-plugin.svg -share/pixmaps/anjuta/anjuta-editor-scintilla-plugin-48.png -share/pixmaps/anjuta/anjuta-editor-scintilla-plugin.svg +%%SCINTILLA%%share/pixmaps/anjuta/anjuta-editor-scintilla-plugin-48.png +%%SCINTILLA%%share/pixmaps/anjuta/anjuta-editor-scintilla-plugin.svg +share/pixmaps/anjuta/element-class-16.png +share/pixmaps/anjuta/element-delegate-16.png +share/pixmaps/anjuta/element-enumeration-16.png +share/pixmaps/anjuta/element-event-16.png +share/pixmaps/anjuta/element-field-16.png +share/pixmaps/anjuta/element-interface-16.png +share/pixmaps/anjuta/element-literal-16.png +share/pixmaps/anjuta/element-method-16.png +share/pixmaps/anjuta/element-namespace-16.png +share/pixmaps/anjuta/element-property-16.png +share/pixmaps/anjuta/element-structure-16.png share/pixmaps/anjuta/anjuta-editor-sourceview-plugin-48.png share/pixmaps/anjuta/anjuta-file-manager-plugin-48.png share/pixmaps/anjuta/anjuta-file-manager-plugin.svg @@ -881,6 +893,7 @@ share/pixmaps/anjuta/anjuta-fold-open-24.png share/pixmaps/anjuta/anjuta-fold-toggle-16.png share/pixmaps/anjuta/anjuta-fold-toggle-24.png share/pixmaps/anjuta/anjuta-gdb.plugin.png +share/pixmaps/anjuta/anjuta-git-plugin-48.png share/pixmaps/anjuta/anjuta-glade-plugin-48.png share/pixmaps/anjuta/anjuta-glade-plugin.svg share/pixmaps/anjuta/anjuta-go-help-next-16.png @@ -933,8 +946,10 @@ share/pixmaps/anjuta/anjuta-project-wizard-plugin-48.png share/pixmaps/anjuta/anjuta-project-wizard-plugin.svg share/pixmaps/anjuta/anjuta-run-to-cursor-16.png share/pixmaps/anjuta/anjuta-run-to-cursor-24.png +share/pixmaps/anjuta/anjuta-run-program-48.png share/pixmaps/anjuta/anjuta-sample-plugin-48.png share/pixmaps/anjuta/anjuta-sample-plugin.svg +share/pixmaps/anjuta/anjuta-scratchbox-48.png share/pixmaps/anjuta/anjuta-search-plugin-48.png share/pixmaps/anjuta/anjuta-search-plugin.svg share/pixmaps/anjuta/anjuta-step-into-16.png @@ -949,6 +964,7 @@ share/pixmaps/anjuta/anjuta-swap-16.png share/pixmaps/anjuta/anjuta-swap-24.png share/pixmaps/anjuta/anjuta-symbol-browser-plugin-48.png share/pixmaps/anjuta/anjuta-symbol-browser-plugin.svg +%%SYMBOL%%share/pixmaps/anjuta/anjuta-symbol-db-plugin-48.png share/pixmaps/anjuta/anjuta-terminal-plugin-48.png share/pixmaps/anjuta/anjuta-terminal-plugin.svg share/pixmaps/anjuta/anjuta-tools-plugin-48.png @@ -991,7 +1007,7 @@ share/pixmaps/anjuta/start-with-import.png @dirrm share/anjuta/ui @dirrm share/anjuta/tools @dirrm share/anjuta/scripts -@dirrm share/anjuta/properties +%%SCINTILLA%%@dirrm share/anjuta/properties @dirrm share/anjuta/project/xlib/src @dirrm share/anjuta/project/xlib/po @dirrm share/anjuta/project/xlib-dock/src @@ -1014,6 +1030,7 @@ share/pixmaps/anjuta/start-with-import.png @dirrm share/anjuta/project/mkfile/po @dirrm share/anjuta/project/mkfile @dirrm share/anjuta/project/minimal +@dirrm share/anjuta/project/licenses @dirrm share/anjuta/project/java/src @dirrm share/anjuta/project/java/po @dirrm share/anjuta/project/java @@ -1031,6 +1048,9 @@ share/pixmaps/anjuta/start-with-import.png @dirrm share/anjuta/project/cpp/src @dirrm share/anjuta/project/cpp/po @dirrm share/anjuta/project/cpp +@dirrm share/anjuta/project/anjuta-plugin-vala/src +@dirrm share/anjuta/project/anjuta-plugin-vala/po +@dirrm share/anjuta/project/anjuta-plugin-vala @dirrm share/anjuta/project/anjuta-plugin/src @dirrm share/anjuta/project/anjuta-plugin/po @dirrm share/anjuta/project/anjuta-plugin @@ -1052,12 +1072,16 @@ share/pixmaps/anjuta/start-with-import.png @dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index e6326a3999aa..5362c457bcf7 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/bug-buddy/Makefile,v 1.60 2008/03/11 03:04:07 mezz Exp $ +# $MCom: ports/devel/bug-buddy/Makefile,v 1.71 2008/11/25 17:43:11 mezz Exp $ # PORTNAME= bug-buddy -PORTVERSION= 2.22.0 -PORTREVISION= 3 +PORTVERSION= 2.24.2 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -24,7 +23,7 @@ USE_GETTEXT= yes INSTALLS_ICONS= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \ +USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus \ gnomedocutils evolutiondataserver GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -32,6 +31,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= bug-buddy.schemas +MAN1= bug-buddy.1 + post-patch: @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \ ${WRKSRC}/src/bugzilla.c diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo index 05e227a42086..b4d410c17103 100644 --- a/devel/bug-buddy/distinfo +++ b/devel/bug-buddy/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/bug-buddy-2.22.0.tar.bz2) = 092e1f91d0be4ca133cd0650622a6b06 -SHA256 (gnome2/bug-buddy-2.22.0.tar.bz2) = 09c6d01f8b029b5ffccabfcbc502f637d06a7989e93c374de24b5b838b9878a6 -SIZE (gnome2/bug-buddy-2.22.0.tar.bz2) = 1076752 +MD5 (gnome2/bug-buddy-2.24.2.tar.bz2) = faeeb2351398b9284eee794ff6ea9588 +SHA256 (gnome2/bug-buddy-2.24.2.tar.bz2) = d64125505546183d44727e812b0ac7e9c60f0fff0eaf164b874974647067cbb4 +SIZE (gnome2/bug-buddy-2.24.2.tar.bz2) = 1109562 diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist index 27e3a523bc6c..7655acd7ebcb 100644 --- a/devel/bug-buddy/pkg-plist +++ b/devel/bug-buddy/pkg-plist @@ -4,7 +4,6 @@ lib/gtk-2.0/modules/libgnomebreakpad.so share/applications/bug-buddy.desktop %%DATADIR%%/bug-buddy.gtkbuilder %%DATADIR%%/bug-buddy.menu -%%DATADIR%%/bug-buddy.png %%DATADIR%%/bugzilla/gnome.bugzilla %%DATADIR%%/bugzilla/gnome/config %%DATADIR%%/bugzilla/gnome/mostfreq @@ -14,7 +13,13 @@ share/applications/bug-buddy.desktop %%DATADIR%%/bugzilla/ximian/mostfreq %%DATADIR%%/bugzilla/ximian/products %%DATADIR%%/gdb-cmd +share/icons/HighContrastLargePrint/48x48/apps/bug-buddy.png +share/icons/hicolor/16x16/apps/bug-buddy.png +share/icons/hicolor/22x22/apps/bug-buddy.png +share/icons/hicolor/24x24/apps/bug-buddy.png +share/icons/hicolor/32x32/apps/bug-buddy.png share/icons/hicolor/48x48/apps/bug-buddy.png +share/icons/hicolor/scalable/apps/bug-buddy.svg share/locale/af/LC_MESSAGES/bug-buddy.mo share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo @@ -53,6 +58,7 @@ share/locale/is/LC_MESSAGES/bug-buddy.mo share/locale/it/LC_MESSAGES/bug-buddy.mo share/locale/ja/LC_MESSAGES/bug-buddy.mo share/locale/ka/LC_MESSAGES/bug-buddy.mo +share/locale/kn/LC_MESSAGES/bug-buddy.mo share/locale/ko/LC_MESSAGES/bug-buddy.mo share/locale/ku/LC_MESSAGES/bug-buddy.mo share/locale/ky/LC_MESSAGES/bug-buddy.mo @@ -72,6 +78,7 @@ share/locale/oc/LC_MESSAGES/bug-buddy.mo share/locale/or/LC_MESSAGES/bug-buddy.mo share/locale/pa/LC_MESSAGES/bug-buddy.mo share/locale/pl/LC_MESSAGES/bug-buddy.mo +share/locale/ps/LC_MESSAGES/bug-buddy.mo share/locale/pt/LC_MESSAGES/bug-buddy.mo share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo share/locale/ro/LC_MESSAGES/bug-buddy.mo @@ -82,7 +89,7 @@ share/locale/sk/LC_MESSAGES/bug-buddy.mo share/locale/sl/LC_MESSAGES/bug-buddy.mo share/locale/sq/LC_MESSAGES/bug-buddy.mo share/locale/sr/LC_MESSAGES/bug-buddy.mo -share/locale/sr@Latn/LC_MESSAGES/bug-buddy.mo +share/locale/sr@latin/LC_MESSAGES/bug-buddy.mo share/locale/sv/LC_MESSAGES/bug-buddy.mo share/locale/ta/LC_MESSAGES/bug-buddy.mo share/locale/te/LC_MESSAGES/bug-buddy.mo @@ -97,6 +104,9 @@ share/locale/xh/LC_MESSAGES/bug-buddy.mo share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo +@dirrmtry share/icons/HighContrastLargePrint/48x48/apps +@dirrmtry share/icons/HighContrastLargePrint/48x48 +@dirrmtry share/icons/HighContrastLargePrint @dirrm %%DATADIR%%/bugzilla/ximian @dirrm %%DATADIR%%/bugzilla/gnome @dirrm %%DATADIR%%/bugzilla @@ -112,10 +122,14 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrmtry share/locale/ug @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile index 2be0fd37d82e..2dac28c6e18e 100644 --- a/devel/dbus-glib/Makefile +++ b/devel/dbus-glib/Makefile @@ -6,7 +6,7 @@ # PORTNAME= dbus -PORTVERSION= 0.76 +PORTVERSION= 0.78 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-glib/ PKGNAMESUFFIX= -glib diff --git a/devel/dbus-glib/distinfo b/devel/dbus-glib/distinfo index 300048eb641b..aae323c5b08e 100644 --- a/devel/dbus-glib/distinfo +++ b/devel/dbus-glib/distinfo @@ -1,3 +1,3 @@ -MD5 (dbus-glib-0.76.tar.gz) = d3b716a7e798faa1c6a867675f00306a -SHA256 (dbus-glib-0.76.tar.gz) = 8bc083faaf3efdd444a8a44bbcbfea501a7b547736fda3c2d83bfdc9b5b672a3 -SIZE (dbus-glib-0.76.tar.gz) = 667547 +MD5 (dbus-glib-0.78.tar.gz) = d4aa04b9df35b4bd663be38e959941c8 +SHA256 (dbus-glib-0.78.tar.gz) = ca366fed6035f75c6ca038f99b780260a0e19f282067b2dd20243ba54105fc21 +SIZE (dbus-glib-0.78.tar.gz) = 683454 diff --git a/devel/dbus-glib/pkg-plist b/devel/dbus-glib/pkg-plist index ca73973caaa3..54bca846061c 100644 --- a/devel/dbus-glib/pkg-plist +++ b/devel/dbus-glib/pkg-plist @@ -1,4 +1,5 @@ bin/dbus-binding-tool +etc/profile.d/dbus-bash-completion.sh include/dbus-%%VERSION%%/dbus/dbus-glib-bindings.h include/dbus-%%VERSION%%/dbus/dbus-glib-error-enum.h include/dbus-%%VERSION%%/dbus/dbus-glib-lowlevel.h @@ -9,6 +10,7 @@ lib/libdbus-glib-1.la lib/libdbus-glib-1.so lib/libdbus-glib-1.so.2 libdata/pkgconfig/dbus-glib-1.pc +libexec/dbus-bash-completion-helper %%DOCSDIR%%/ch01.html %%DOCSDIR%%/ch02.html %%DOCSDIR%%/ch03.html @@ -30,3 +32,4 @@ libdata/pkgconfig/dbus-glib-1.pc %%DOCSDIR%%/style.css %%DOCSDIR%%/up.png @dirrm %%DOCSDIR%% +@dirrmtry etc/profile.d diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index c5a63e7e2b0d..89df6ae07e7a 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -6,17 +6,18 @@ # PORTNAME= dbus -PORTVERSION?= 1.2.1 +PORTVERSION?= 1.2.4.2 PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ +DISTNAME= dbus-${PORTVERSION}permissive MAINTAINER= gnome@FreeBSD.org COMMENT= A message bus system for inter-application communication LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -USE_GNOME?= gnomehack gnometarget libxml2 ltverhack +USE_GNOME?= gnomehack libxml2 ltverhack USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo index 19b7feafa05f..00cc4ea6a0c2 100644 --- a/devel/dbus/distinfo +++ b/devel/dbus/distinfo @@ -1,3 +1,3 @@ -MD5 (dbus-1.2.1.tar.gz) = b57aa1ba0834cbbb1e7502dc2cbfacc2 -SHA256 (dbus-1.2.1.tar.gz) = 8016540602189e1dca6aca6b7c0735706387e4f85ced75217c6a874980fd0e86 -SIZE (dbus-1.2.1.tar.gz) = 1406833 +MD5 (dbus-1.2.4.2permissive.tar.gz) = 92418f1d2932c2f4980b815e00c993cc +SHA256 (dbus-1.2.4.2permissive.tar.gz) = 1d384f4d1c7d2e022e68e421f980c3e60557016d44999560f2136d2a58f7c9c9 +SIZE (dbus-1.2.4.2permissive.tar.gz) = 1574034 diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c index bd0353d36d62..aa623c158889 100644 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c +++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c @@ -1,6 +1,6 @@ ---- dbus/dbus-sysdeps-unix.c.orig 2008-02-15 20:26:46.000000000 -0500 -+++ dbus/dbus-sysdeps-unix.c 2008-02-15 20:28:46.000000000 -0500 -@@ -1032,9 +1032,9 @@ write_credentials_byte (int +--- dbus/dbus-sysdeps-unix.c.orig 2008-08-06 13:00:29.000000000 -0400 ++++ dbus/dbus-sysdeps-unix.c 2008-08-10 15:04:32.000000000 -0400 +@@ -1041,9 +1041,9 @@ write_credentials_byte (int int bytes_written; char buf[1] = { '\0' }; #if defined(HAVE_CMSGCRED) @@ -12,7 +12,7 @@ } cmsg; struct iovec iov; struct msghdr msg; -@@ -1045,10 +1045,10 @@ write_credentials_byte (int +@@ -1054,10 +1054,10 @@ write_credentials_byte (int msg.msg_iov = &iov; msg.msg_iovlen = 1; @@ -26,7 +26,7 @@ cmsg.hdr.cmsg_level = SOL_SOCKET; cmsg.hdr.cmsg_type = SCM_CREDS; #endif -@@ -1124,9 +1124,9 @@ _dbus_read_credentials_socket (int +@@ -1133,9 +1133,9 @@ _dbus_read_credentials_socket (int pid_read = DBUS_PID_UNSET; #ifdef HAVE_CMSGCRED @@ -38,7 +38,7 @@ } cmsg; #elif defined(LOCAL_CREDS) -@@ -1163,8 +1163,8 @@ _dbus_read_credentials_socket (int +@@ -1172,8 +1172,8 @@ _dbus_read_credentials_socket (int #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) memset (&cmsg, 0, sizeof (cmsg)); @@ -49,7 +49,7 @@ #endif again: -@@ -1202,7 +1202,8 @@ _dbus_read_credentials_socket (int +@@ -1211,7 +1211,8 @@ _dbus_read_credentials_socket (int } #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) @@ -59,7 +59,7 @@ { dbus_set_error (error, DBUS_ERROR_FAILED, "Message from recvmsg() was not SCM_CREDS"); -@@ -1229,8 +1230,11 @@ _dbus_read_credentials_socket (int +@@ -1238,8 +1239,11 @@ _dbus_read_credentials_socket (int cr_len, (int) sizeof (cr), _dbus_strerror (errno)); } #elif defined(HAVE_CMSGCRED) diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c new file mode 100644 index 000000000000..cdf6eaf0796d --- /dev/null +++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c @@ -0,0 +1,10 @@ +--- dbus/dbus-sysdeps-util-unix.c.orig 2008-12-21 14:51:17.000000000 -0500 ++++ dbus/dbus-sysdeps-util-unix.c 2008-12-21 14:51:37.000000000 -0500 +@@ -38,6 +38,7 @@ + #include <stdio.h> + #include <errno.h> + #include <fcntl.h> ++#include <syslog.h> + #include <sys/stat.h> + #include <grp.h> + #include <sys/socket.h> diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index 46f4d75ff26b..5f0c3dca365c 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -3,16 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/devel/devhelp/Makefile,v 1.10 2009/01/09 22:20:28 kwm Exp $ PORTNAME= devhelp -PORTVERSION= 0.19.1 -PORTREVISION= 1 +PORTVERSION= 0.22 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kwm@FreeBSD.org COMMENT= Developer help browser for GNOME 2 USE_BZIP2= yes @@ -43,10 +42,6 @@ PLIST_SUB+= GEDIT="" PLIST_SUB+= GEDIT="@comment " .endif -# This target is only meant to be used by the port maintainer. -x-generate-plist: - (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${SED} -E 's,.*share/nls/.+$$,,g;s,^@dirrm share/((gnome/[^d]|pixmaps|application|locale).*|gnome$$),,;s,^@dirrm etc/gconf.*,,;s,^etc/gconf/gconf.*,,'|${TR} -s '\n') > temp-pkg-plist - post-patch: .if defined(WITHOUT_GEDIT) @${REINPLACE_CMD} -e 's|gedit-plugin||' \ diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo index 6421119815df..8c21dd82e15f 100644 --- a/devel/devhelp/distinfo +++ b/devel/devhelp/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/devhelp-0.19.1.tar.bz2) = 6c12a272a94ac9cfc1dc6234590b46d8 -SHA256 (gnome2/devhelp-0.19.1.tar.bz2) = be447b9496b09e97bde51e6d638c94e6e4718feebe6b3c76cf256a18baf22e4f -SIZE (gnome2/devhelp-0.19.1.tar.bz2) = 533193 +MD5 (gnome2/devhelp-0.22.tar.bz2) = 7cdd0688dba0184b6dd2688532af24cb +SHA256 (gnome2/devhelp-0.22.tar.bz2) = 1fa4b69c99b10de0e27374e18eea7988e3e8f9243020a22a47f79c9ccad92947 +SIZE (gnome2/devhelp-0.22.tar.bz2) = 517581 diff --git a/devel/devhelp/files/patch-src_dh-base.c b/devel/devhelp/files/patch-src_dh-base.c index ffa3c3b54602..3dbf1c71cf4e 100644 --- a/devel/devhelp/files/patch-src_dh-base.c +++ b/devel/devhelp/files/patch-src_dh-base.c @@ -1,13 +1,14 @@ ---- src/dh-base.c.orig Tue May 15 13:00:24 2007 -+++ src/dh-base.c Sun Jul 8 03:48:13 2007 -@@ -233,6 +233,10 @@ base_add_books_in_data_dir (DhBase *base - dir = g_build_filename (data_dir, "devhelp", "books", NULL); - base_add_books (base, dir); - g_free (dir); +--- src/dh-base.c.orig 2008-10-11 00:00:18.000000000 +0200 ++++ src/dh-base.c 2009-01-09 23:10:12.000000000 +0100 +@@ -214,6 +214,11 @@ base_add_books_in_data_dir (DhBase + dir = g_build_filename (data_dir, "devhelp", "books", NULL); + base_add_books (base, dir); + g_free (dir); ++ ++ dir = g_build_filename (data_dir, "doc", NULL); ++ base_add_books (base, dir); ++ g_free (dir); + -+ dir = g_build_filename (data_dir, "doc", NULL); -+ base_add_books (base, dir); -+ g_free (dir); } static void diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist index 4584ddfe5609..83649fae27a5 100644 --- a/devel/devhelp/pkg-plist +++ b/devel/devhelp/pkg-plist @@ -1,16 +1,13 @@ bin/devhelp +include/devhelp-1.0/devhelp/dh-assistant-view.h +include/devhelp-1.0/devhelp/dh-assistant.h include/devhelp-1.0/devhelp/dh-base.h include/devhelp-1.0/devhelp/dh-book-tree.h include/devhelp-1.0/devhelp/dh-error.h -include/devhelp-1.0/devhelp/dh-html.h include/devhelp-1.0/devhelp/dh-keyword-model.h include/devhelp-1.0/devhelp/dh-link.h -include/devhelp-1.0/devhelp/dh-parser.h -include/devhelp-1.0/devhelp/dh-preferences.h include/devhelp-1.0/devhelp/dh-search.h -include/devhelp-1.0/devhelp/dh-util.h include/devhelp-1.0/devhelp/dh-window.h -include/devhelp-1.0/devhelp/eggfindbar.h %%GEDIT%%lib/gedit-2/plugins/devhelp.gedit-plugin %%GEDIT%%lib/gedit-2/plugins/devhelp/__init__.py %%GEDIT%%lib/gedit-2/plugins/devhelp/__init__.pyc @@ -24,12 +21,11 @@ lib/libdevhelp-1.so lib/libdevhelp-1.so.0 libdata/pkgconfig/libdevhelp-1.0.pc share/applications/devhelp.desktop -share/devhelp/default-prefs.js -share/devhelp/devhelp.glade +share/devhelp/assistant/assistant.css +share/devhelp/assistant/assistant.js +share/devhelp/devhelp.defaults share/devhelp/dtd/devhelp-1.dtd -share/devhelp/images/book_closed.png -share/devhelp/images/book_open.png -share/devhelp/images/helpdoc.png +share/devhelp/ui/devhelp.builder share/devhelp/ui/window.ui share/icons/hicolor/16x16/apps/devhelp.png share/icons/hicolor/22x22/apps/devhelp.png @@ -81,6 +77,7 @@ share/locale/oc/LC_MESSAGES/devhelp.mo share/locale/or/LC_MESSAGES/devhelp.mo share/locale/pa/LC_MESSAGES/devhelp.mo share/locale/pl/LC_MESSAGES/devhelp.mo +share/locale/ps/LC_MESSAGES/devhelp.mo share/locale/pt/LC_MESSAGES/devhelp.mo share/locale/pt_BR/LC_MESSAGES/devhelp.mo share/locale/ru/LC_MESSAGES/devhelp.mo @@ -103,6 +100,7 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo @dirrm share/devhelp/ui @dirrm share/devhelp/images @dirrm share/devhelp/dtd +@dirrm share/devhelp/assistant @dirrm share/devhelp @dirrm include/devhelp-1.0/devhelp @dirrm include/devhelp-1.0 @@ -110,10 +108,16 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/sr@Latn/LC_MESSAGES +@dirrmtry share/locale/sr@Latn @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile index fa5bb40801c2..9a1a9cedb1a8 100644 --- a/devel/gamin/Makefile +++ b/devel/gamin/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gamin/Makefile,v 1.4 2008/01/09 19:55:24 marcus Exp $ +# $MCom: ports/devel/gamin/Makefile,v 1.6 2008/11/26 06:48:13 marcus Exp $ # PORTNAME= gamin -PORTVERSION= 0.1.9 -PORTREVISION= 2 +PORTVERSION= 0.1.10 CATEGORIES?= devel MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/ diff --git a/devel/gamin/distinfo b/devel/gamin/distinfo index fffc0de2e3ad..399e962883db 100644 --- a/devel/gamin/distinfo +++ b/devel/gamin/distinfo @@ -1,3 +1,3 @@ -MD5 (gamin-0.1.9.tar.gz) = 2d3a6a70df090ed923238e381e6c2982 -SHA256 (gamin-0.1.9.tar.gz) = 19e2c620e84da678b629d4acb07d93f47a2e5075982892646f77520bb277f239 -SIZE (gamin-0.1.9.tar.gz) = 645429 +MD5 (gamin-0.1.10.tar.gz) = b4ec549e57da470c04edd5ec2876a028 +SHA256 (gamin-0.1.10.tar.gz) = 28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1 +SIZE (gamin-0.1.10.tar.gz) = 653392 diff --git a/devel/gamin/files/patch-python_Makefile.in b/devel/gamin/files/patch-python_Makefile.in index 3cc568b4e851..24bbe73c6d67 100644 --- a/devel/gamin/files/patch-python_Makefile.in +++ b/devel/gamin/files/patch-python_Makefile.in @@ -1,23 +1,20 @@ ---- python/Makefile.in.orig Mon Feb 6 23:00:32 2006 -+++ python/Makefile.in Tue Feb 7 08:10:46 2006 -@@ -59,7 +59,7 @@ +--- python/Makefile.in.orig 2008-11-26 01:42:29.000000000 -0500 ++++ python/Makefile.in 2008-11-26 01:43:26.000000000 -0500 +@@ -53,7 +53,7 @@ am__strip_dir = `echo $$p | sed -e 's|^. + am__installdirs = "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pythondir)" pythonLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(python_LTLIBRARIES) - @WITH_PYTHON_TRUE@am__DEPENDENCIES_1 = \ --@WITH_PYTHON_TRUE@ $(top_builddir)/libgamin/libgamin-1.la -+@WITH_PYTHON_TRUE@ -lgamin-1 - @WITH_PYTHON_TRUE@_gamin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) - am___gamin_la_SOURCES_DIST = gamin.c - @WITH_PYTHON_TRUE@am__gamin_la_OBJECTS = gamin.lo -@@ -239,9 +239,9 @@ - gamin.c \ - gamin.py +-_gamin_la_DEPENDENCIES = $(top_builddir)/libgamin/libgamin-1.la ++_gamin_la_DEPENDENCIES = -lgamin-1 + am__gamin_la_OBJECTS = gamin.lo + _gamin_la_OBJECTS = $(am__gamin_la_OBJECTS) + _gamin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -228,7 +228,7 @@ INCLUDES = \ --_gamin_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/libgamin/.libs -+_gamin_la_LDFLAGS = -module -avoid-version - @WITH_PYTHON_TRUE@mylibs = \ --@WITH_PYTHON_TRUE@ $(top_builddir)/libgamin/libgamin-1.la -+@WITH_PYTHON_TRUE@ -lgamin-1 - - @WITH_PYTHON_TRUE@python_LTLIBRARIES = _gamin.la - @WITH_PYTHON_TRUE@_gamin_la_SOURCES = gamin.c + python_LTLIBRARIES = _gamin.la + _gamin_la_SOURCES = gamin.c +-_gamin_la_LIBADD = $(top_builddir)/libgamin/libgamin-1.la ++_gamin_la_LIBADD = -lgamin-1 + _gamin_la_LDFLAGS = -module -avoid-version + python_PYTHON = gamin.py + all: all-recursive diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 540ece1a10c5..f9127163f048 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gconf2/Makefile,v 1.96 2008/03/10 16:25:56 ahze Exp $ +# $MCom: ports/devel/gconf2/Makefile,v 1.102 2008/09/23 04:54:38 marcus Exp $ # PORTNAME= gconf2 -PORTVERSION= 2.22.0 -PORTREVISION?= 1 +PORTVERSION= 2.24.0 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,6 +22,9 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + polkit.2:${PORTSDIR}/sysutils/policykit + USE_GMAKE= yes USE_GETTEXT= yes USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \ diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index 69fd7f190c62..f3cebd9eea58 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/GConf-2.22.0.tar.bz2) = a56c043afeb1052abaf45407409b0331 -SHA256 (gnome2/GConf-2.22.0.tar.bz2) = 54e40cf047eb431cdf994f763ae840107ed6e9b8f9521b2b2eb07c7a55f92ce0 -SIZE (gnome2/GConf-2.22.0.tar.bz2) = 1416685 +MD5 (gnome2/GConf-2.24.0.tar.bz2) = 4971d96f5ba94fe4a69396267bd5afe8 +SHA256 (gnome2/GConf-2.24.0.tar.bz2) = 990003904ee13b2fd98a61d55fa4d0fcb30fb233454a036bb9465f42d1acbb1b +SIZE (gnome2/GConf-2.24.0.tar.bz2) = 1467817 diff --git a/devel/gconf2/files/patch-gconf_gconfd.c b/devel/gconf2/files/patch-gconf_gconfd.c index ef551cb28e81..31a6470a42e5 100644 --- a/devel/gconf2/files/patch-gconf_gconfd.c +++ b/devel/gconf2/files/patch-gconf_gconfd.c @@ -1,6 +1,6 @@ ---- gconf/gconfd.c.orig Fri May 5 12:40:23 2006 -+++ gconf/gconfd.c Fri May 5 12:41:43 2006 -@@ -124,12 +124,6 @@ +--- gconf/gconfd.c.orig 2008-05-10 08:34:31.000000000 -0400 ++++ gconf/gconfd.c 2008-08-16 14:08:05.000000000 -0400 +@@ -123,12 +123,6 @@ static void gconf_handle_segv (int signu static gboolean in_shutdown = FALSE; @@ -13,10 +13,11 @@ /* * CORBA goo */ -@@ -410,6 +404,18 @@ +@@ -408,6 +402,18 @@ gconf_server_load_sources(void) + } } - static void ++static void +reload_db (void) +{ + gconf_log (GCL_INFO, _("SIGHUP received, reloading all databases")); @@ -28,22 +29,20 @@ + logfile_read (); +} + -+static void - signal_handler (int signo) - { - static gint in_fatal = 0; -@@ -482,8 +488,8 @@ + /* + * Signal handlers should not log debug messages as this code is non-reentrant. + * Please avoid calling gconf_log in this function. +@@ -471,8 +477,7 @@ signal_handler (int signo) case SIGHUP: --in_fatal; - /* reload sources during next periodic_cleanup() */ - need_db_reload = TRUE; -+ /* reload sources immediately */ + reload_db (); break; #endif -@@ -864,18 +870,6 @@ +@@ -828,17 +833,6 @@ static gboolean need_log_cleanup = FALSE static gboolean periodic_cleanup_timeout(gpointer data) { @@ -58,7 +57,6 @@ - gconf_server_load_sources (); - logfile_read (); - } -- + gconf_log (GCL_DEBUG, "Performing periodic cleanup, expiring cache cruft"); - drop_old_clients (); diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index fc96aad3d6fd..85be04736253 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -1,5 +1,6 @@ bin/gconf-merge-tree bin/gconftool-2 +etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf %%LDAP%%etc/gconf/2/evoldap.conf etc/gconf/2/path include/gconf/2/gconf/gconf-changeset.h @@ -11,6 +12,7 @@ include/gconf/2/gconf/gconf-listeners.h include/gconf/2/gconf/gconf-schema.h include/gconf/2/gconf/gconf-value.h include/gconf/2/gconf/gconf.h +libexec/gconf-defaults-mechanism %%LDAP%%lib/GConf/2/libgconfbackend-evoldap.a %%LDAP%%lib/GConf/2/libgconfbackend-evoldap.la %%LDAP%%lib/GConf/2/libgconfbackend-evoldap.so @@ -29,6 +31,9 @@ libexec/gconf-sanity-check-2 libexec/gconfd-2 %%LDAP%%share/GConf/schema/evoldap.schema share/aclocal/gconf-2.m4 +share/PolicyKit/policy/org.gnome.gconf.defaults.policy +share/dbus-1/system-services/org.gnome.GConf.Defaults.service +share/dbus-1/services/org.gnome.GConf.service share/locale/am/LC_MESSAGES/GConf2.mo share/locale/ar/LC_MESSAGES/GConf2.mo share/locale/as/LC_MESSAGES/GConf2.mo @@ -65,10 +70,12 @@ share/locale/is/LC_MESSAGES/GConf2.mo share/locale/it/LC_MESSAGES/GConf2.mo share/locale/ja/LC_MESSAGES/GConf2.mo share/locale/ka/LC_MESSAGES/GConf2.mo +share/locale/kn/LC_MESSAGES/GConf2.mo share/locale/ko/LC_MESSAGES/GConf2.mo share/locale/ku/LC_MESSAGES/GConf2.mo share/locale/lt/LC_MESSAGES/GConf2.mo share/locale/lv/LC_MESSAGES/GConf2.mo +share/locale/mai/LC_MESSAGES/GConf2.mo share/locale/mg/LC_MESSAGES/GConf2.mo share/locale/mk/LC_MESSAGES/GConf2.mo share/locale/ml/LC_MESSAGES/GConf2.mo @@ -93,7 +100,7 @@ share/locale/sk/LC_MESSAGES/GConf2.mo share/locale/sl/LC_MESSAGES/GConf2.mo share/locale/sq/LC_MESSAGES/GConf2.mo share/locale/sr/LC_MESSAGES/GConf2.mo -share/locale/sr@Latn/LC_MESSAGES/GConf2.mo +share/locale/sr@latin/LC_MESSAGES/GConf2.mo share/locale/sv/LC_MESSAGES/GConf2.mo share/locale/ta/LC_MESSAGES/GConf2.mo share/locale/te/LC_MESSAGES/GConf2.mo @@ -122,6 +129,8 @@ share/sgml/gconf/gconf-1.0.dtd @dirrmtry share/locale/xh @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @@ -132,6 +141,8 @@ share/sgml/gconf/gconf-1.0.dtd @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile index d8269f08ab19..45bb0d961ca9 100644 --- a/devel/gconfmm26/Makefile +++ b/devel/gconfmm26/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/devel/gconfmm26/Makefile,v 1.20 2008/03/08 16:24:44 marcus Exp $ +# $MCom: ports/devel/gconfmm26/Makefile,v 1.23 2008/09/22 11:47:53 kwm Exp $ # PORTNAME= gconfmm -PORTVERSION= 2.22.0 -PORTREVISION= 2 +PORTVERSION= 2.24.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo index 12c3db942420..20aa775d8721 100644 --- a/devel/gconfmm26/distinfo +++ b/devel/gconfmm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gconfmm-2.22.0.tar.bz2) = 4090b7333a928c6baeff583a9a0b2b55 -SHA256 (gnome2/gconfmm-2.22.0.tar.bz2) = ff0db2c7d91f69f825ec5988547ebf5be144930b4f4013c678313ee0b2725f4a -SIZE (gnome2/gconfmm-2.22.0.tar.bz2) = 283460 +MD5 (gnome2/gconfmm-2.24.0.tar.bz2) = cd2c3c919dbf8f90f703680d2fa088b2 +SHA256 (gnome2/gconfmm-2.24.0.tar.bz2) = d801f3422411269b4234e97589d8c90a2495336320e608c5aab4a277c0010baa +SIZE (gnome2/gconfmm-2.24.0.tar.bz2) = 298222 diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile index 213d7c5f640d..3793ee1b7566 100644 --- a/devel/gio-fam-backend/Makefile +++ b/devel/gio-fam-backend/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.9 2008/03/12 17:46:37 marcus Exp $ +# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.24 2009/01/09 21:30:35 kwm Exp $ # PORTNAME= gio-fam-backend -PORTVERSION= 2.16.5 +PORTVERSION= 2.18.4 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/}/ \ @@ -26,7 +26,7 @@ USE_BZIP2= yes BUILD_WRKSRC= ${WRKSRC}/gio/fam INSTALL_WRKSRC= ${BUILD_WRKSRC} GNU_CONFIGURE= yes -USE_GNOME= gnomehack gnometarget pkgconfig _glib20 +USE_GNOME= gnomehack pkgconfig _glib20 USE_FAM= yes USE_GMAKE= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo index e0bf9be7e599..d16c3b42fe58 100644 --- a/devel/gio-fam-backend/distinfo +++ b/devel/gio-fam-backend/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glib-2.16.5.tar.bz2) = 039f02d47d4071322a3f00abf031e5d9 -SHA256 (gnome2/glib-2.16.5.tar.bz2) = cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20 -SIZE (gnome2/glib-2.16.5.tar.bz2) = 4570123 +MD5 (gnome2/glib-2.18.4.tar.bz2) = ec25ed261534d870141000ab73f1a2bf +SHA256 (gnome2/glib-2.18.4.tar.bz2) = 6aeb2c845e9fdc388943acdaba2f6357e3007c5ffaa8d666904679cfb40de100 +SIZE (gnome2/glib-2.18.4.tar.bz2) = 4809051 diff --git a/devel/gio-fam-backend/pkg-plist b/devel/gio-fam-backend/pkg-plist index 4304d626a688..7e06d5a98ee3 100644 --- a/devel/gio-fam-backend/pkg-plist +++ b/devel/gio-fam-backend/pkg-plist @@ -1,5 +1,3 @@ lib/gio/modules/libgiofam.a lib/gio/modules/libgiofam.la lib/gio/modules/libgiofam.so -@dirrmtry lib/gio/modules -@dirrmtry lib/gio diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 810534940c64..33e5a3ed6454 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,12 +3,13 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.117 2008/03/19 04:44:58 marcus Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.137 2009/01/09 21:30:35 kwm Exp $ # +# !! DON'T FORGET ABOUT devel/gio-fam-backend !! PORTNAME= glib -PORTVERSION= 2.16.5 -PORTREVISION?= 1 +PORTVERSION= 2.18.4 +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/}/ \ @@ -33,7 +34,7 @@ LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes -USE_GNOME= gnomehack gnometarget pkgconfig ltverhack +USE_GNOME= gnomehack pkgconfig ltverhack USE_GMAKE= yes USE_PYTHON= yes USE_PERL5= yes diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index e0bf9be7e599..d16c3b42fe58 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glib-2.16.5.tar.bz2) = 039f02d47d4071322a3f00abf031e5d9 -SHA256 (gnome2/glib-2.16.5.tar.bz2) = cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20 -SIZE (gnome2/glib-2.16.5.tar.bz2) = 4570123 +MD5 (gnome2/glib-2.18.4.tar.bz2) = ec25ed261534d870141000ab73f1a2bf +SHA256 (gnome2/glib-2.18.4.tar.bz2) = 6aeb2c845e9fdc388943acdaba2f6357e3007c5ffaa8d666904679cfb40de100 +SIZE (gnome2/glib-2.18.4.tar.bz2) = 4809051 diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in index 3c5676d2eb1e..4791780e29cc 100644 --- a/devel/glib20/files/extra-patch-glib_Makefile.in +++ b/devel/glib20/files/extra-patch-glib_Makefile.in @@ -1,9 +1,9 @@ ---- glib/Makefile.in.orig Wed Jul 19 01:08:13 2006 -+++ glib/Makefile.in Wed Jul 19 01:09:10 2006 -@@ -130,7 +130,7 @@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +--- glib/Makefile.in.orig 2008-12-01 16:15:34.000000000 -0500 ++++ glib/Makefile.in 2008-12-01 16:16:03.000000000 -0500 +@@ -272,7 +272,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ + LD = @LD@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -licui18n LIBOBJS = @LIBOBJS@ diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index 2ba6ab189dda..0345b8acd046 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig 2008-03-17 23:32:05.000000000 -0400 -+++ configure 2008-03-18 17:55:42.000000000 -0400 -@@ -32748,6 +32748,12 @@ cat confdefs.h >>conftest.$ac_ext +--- configure.orig 2008-11-24 13:44:42.000000000 -0600 ++++ configure 2008-11-24 13:50:51.000000000 -0600 +@@ -29576,6 +29576,12 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -13,16 +13,16 @@ int main () { -@@ -34051,7 +34057,7 @@ done +@@ -31407,7 +31413,7 @@ -for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid +for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` - { echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -39139,6 +39145,8 @@ fi + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -36810,6 +36816,8 @@ ;; esac fi diff --git a/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h index 58aa93037507..039571d8b496 100644 --- a/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h +++ b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h @@ -1,12 +1,12 @@ ---- gio/xdgmime/xdgmimecache.h.orig 2007-09-13 16:35:37.000000000 -0400 -+++ gio/xdgmime/xdgmimecache.h 2007-09-14 00:59:43.000000000 -0400 -@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach - #define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents) - #define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass) - #define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type) -+#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type) -+#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal) -+#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal) - +--- gio/xdgmime/xdgmimecache.h.orig 2008-06-12 10:25:40.000000000 -0400 ++++ gio/xdgmime/xdgmimecache.h 2008-06-14 00:49:59.000000000 -0400 +@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach + #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) + #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) + #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) ++#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) ++#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) ++#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) #endif + extern XdgMimeCache **_caches; diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in index 9cec8906fb28..352c0cf6031c 100644 --- a/devel/glib20/files/patch-glib::libcharset::Makefile.in +++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in @@ -1,6 +1,6 @@ ---- glib/libcharset/Makefile.in.orig 2007-12-21 16:55:09.000000000 -0500 -+++ glib/libcharset/Makefile.in 2007-12-21 16:56:04.000000000 -0500 -@@ -277,15 +277,15 @@ EXTRA_DIST = README config.charset ref-a +--- glib/libcharset/Makefile.in.orig 2008-06-04 00:03:14.000000000 +0200 ++++ glib/libcharset/Makefile.in 2008-06-04 00:05:58.000000000 +0200 +@@ -278,7 +278,7 @@ EXTRA_DIST = README config.charset ref-a codeset.m4 update.sh make-patch.sh libcharset-glib.patch TEST_PROGS = INCLUDES = \ @@ -9,7 +9,8 @@ noinst_LTLIBRARIES = libcharset.la libcharset_la_SOURCES = \ - libcharset.h \ +@@ -286,8 +286,8 @@ libcharset_la_SOURCES = \ + localcharset.h \ localcharset.c -charset_alias = $(DESTDIR)$(libdir)/charset.alias @@ -19,7 +20,7 @@ SUFFIXES = .sed .sin CLEANFILES = charset.alias ref-add.sed ref-del.sed all: all-am -@@ -497,7 +497,7 @@ install-data-am: +@@ -498,7 +498,7 @@ install-data-am: install-dvi: install-dvi-am diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 44bbc76976a6..48f0c14e712e 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -17,6 +17,8 @@ include/glib-2.0/gio/gcontenttype.h include/glib-2.0/gio/gdatainputstream.h include/glib-2.0/gio/gdataoutputstream.h include/glib-2.0/gio/gdrive.h +include/glib-2.0/gio/gemblem.h +include/glib-2.0/gio/gemblemedicon.h include/glib-2.0/gio/gfile.h include/glib-2.0/gio/gfileattribute.h include/glib-2.0/gio/gfileenumerator.h @@ -31,10 +33,12 @@ include/glib-2.0/gio/gfilteroutputstream.h include/glib-2.0/gio/gicon.h include/glib-2.0/gio/ginputstream.h include/glib-2.0/gio/gio.h +include/glib-2.0/gio/gioenums.h include/glib-2.0/gio/gioenumtypes.h include/glib-2.0/gio/gioerror.h include/glib-2.0/gio/giomodule.h include/glib-2.0/gio/gioscheduler.h +include/glib-2.0/gio/giotypes.h include/glib-2.0/gio/gloadableicon.h include/glib-2.0/gio/gmemoryinputstream.h include/glib-2.0/gio/gmemoryoutputstream.h @@ -204,6 +208,7 @@ share/locale/ko/LC_MESSAGES/glib20.mo share/locale/ku/LC_MESSAGES/glib20.mo share/locale/lt/LC_MESSAGES/glib20.mo share/locale/lv/LC_MESSAGES/glib20.mo +share/locale/mai/LC_MESSAGES/glib20.mo share/locale/mg/LC_MESSAGES/glib20.mo share/locale/mk/LC_MESSAGES/glib20.mo share/locale/ml/LC_MESSAGES/glib20.mo @@ -218,6 +223,7 @@ share/locale/oc/LC_MESSAGES/glib20.mo share/locale/or/LC_MESSAGES/glib20.mo share/locale/pa/LC_MESSAGES/glib20.mo share/locale/pl/LC_MESSAGES/glib20.mo +share/locale/ps/LC_MESSAGES/glib20.mo share/locale/pt/LC_MESSAGES/glib20.mo share/locale/pt_BR/LC_MESSAGES/glib20.mo share/locale/ro/LC_MESSAGES/glib20.mo @@ -228,8 +234,8 @@ share/locale/sk/LC_MESSAGES/glib20.mo share/locale/sl/LC_MESSAGES/glib20.mo share/locale/sq/LC_MESSAGES/glib20.mo share/locale/sr/LC_MESSAGES/glib20.mo -share/locale/sr@Latn/LC_MESSAGES/glib20.mo share/locale/sr@ije/LC_MESSAGES/glib20.mo +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 @@ -248,6 +254,9 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrm share/glib-2.0/gettext/po @dirrm share/glib-2.0/gettext @dirrm share/glib-2.0 +@exec mkdir -p %D/lib/gio/modules +@dirrmtry lib/gio/modules +@dirrmtry lib/gio @dirrm include/glib-2.0/gobject @dirrm include/glib-2.0/glib @dirrm include/glib-2.0/gio @@ -266,18 +275,24 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrmtry share/locale/tl @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/hy/LC_MESSAGES diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index cea3e3382df6..437f13cbf92b 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -3,16 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glibmm/Makefile,v 1.58 2008/03/10 23:01:49 ahze Exp $ +# $MCom: ports/devel/glibmm/Makefile,v 1.68 2008/10/21 15:59:45 mezz Exp $ # PORTNAME= glibmm -PORTVERSION= 2.16.4 +PORTVERSION= 2.18.1 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -28,9 +27,9 @@ LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes -USE_GNOME= gnomehack gnometarget glib20 +USE_GNOME= gnomehack glib20 ltverhack USE_PERL5= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo index 1f5c23b56d76..61f8ad49d045 100644 --- a/devel/glibmm/distinfo +++ b/devel/glibmm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glibmm-2.16.4.tar.bz2) = fe2e91fa93759ffc812e80ca50ace233 -SHA256 (gnome2/glibmm-2.16.4.tar.bz2) = a6d165e61d03e52956a040de4ccd8d35364be22124c6be6d048214aa6d7eae83 -SIZE (gnome2/glibmm-2.16.4.tar.bz2) = 6375753 +MD5 (gnome2/glibmm-2.18.1.tar.bz2) = 942290a4b77dac3ea18a5b70373fe04c +SHA256 (gnome2/glibmm-2.18.1.tar.bz2) = 79641fe9ca2ad2ad4c49f2ebe15f360b16cbbff852eaa51c99b8f36b362ce649 +SIZE (gnome2/glibmm-2.18.1.tar.bz2) = 6714825 diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist index 4ecfe4391546..c6208677d2fb 100644 --- a/devel/glibmm/pkg-plist +++ b/devel/glibmm/pkg-plist @@ -100,6 +100,7 @@ include/glibmm-%%API_VERSION%%/glibmm/main.h include/glibmm-%%API_VERSION%%/glibmm/markup.h include/glibmm-%%API_VERSION%%/glibmm/miscutils.h include/glibmm-%%API_VERSION%%/glibmm/module.h +include/glibmm-%%API_VERSION%%/glibmm/nodetree.h include/glibmm-%%API_VERSION%%/glibmm/object.h include/glibmm-%%API_VERSION%%/glibmm/objectbase.h include/glibmm-%%API_VERSION%%/glibmm/optioncontext.h @@ -116,6 +117,7 @@ include/glibmm-%%API_VERSION%%/glibmm/private/iochannel_p.h include/glibmm-%%API_VERSION%%/glibmm/private/keyfile_p.h include/glibmm-%%API_VERSION%%/glibmm/private/markup_p.h include/glibmm-%%API_VERSION%%/glibmm/private/module_p.h +include/glibmm-%%API_VERSION%%/glibmm/private/nodetree_p.h include/glibmm-%%API_VERSION%%/glibmm/private/object_p.h include/glibmm-%%API_VERSION%%/glibmm/private/optioncontext_p.h include/glibmm-%%API_VERSION%%/glibmm/private/optionentry_p.h diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile index b17449dbb6cb..aefb73e37044 100644 --- a/devel/gnome-build/Makefile +++ b/devel/gnome-build/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gnome-build/Makefile,v 1.5 2007/09/09 22:45:25 mezz Exp $ +# $MCom: ports/devel/gnome-build/Makefile,v 1.9 2008/10/20 03:25:46 mezz Exp $ # PORTNAME= gnome-build -PORTVERSION= 0.2.4 -PORTREVISION= 2 +PORTVERSION= 2.24.1 PORTEPOCH= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -18,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A GNOME Build Framework (GBF) BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext -LIB_DEPENDS= gdl-gnome-1.0:${PORTSDIR}/x11-toolkits/gdl +LIB_DEPENDS= gdl-1.0:${PORTSDIR}/x11-toolkits/gdl RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext USE_BZIP2= yes diff --git a/devel/gnome-build/distinfo b/devel/gnome-build/distinfo index f6ab147151ef..df535af68f22 100644 --- a/devel/gnome-build/distinfo +++ b/devel/gnome-build/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-build-0.2.4.tar.bz2) = 1d424be4ec2d7bd2fbac12f08de6f346 -SHA256 (gnome2/gnome-build-0.2.4.tar.bz2) = 25f259ddf33441c8fb8b5a5597b8afc628bff5456c780d5875f05ac379460f63 -SIZE (gnome2/gnome-build-0.2.4.tar.bz2) = 483854 +MD5 (gnome2/gnome-build-2.24.1.tar.bz2) = b35c918b6c0c70652e9eb1d2e45138f1 +SHA256 (gnome2/gnome-build-2.24.1.tar.bz2) = 35c8bf4ebbe93639400985c92322f1be80de3e193ed1d715443949bb9a5c43a0 +SIZE (gnome2/gnome-build-2.24.1.tar.bz2) = 517031 diff --git a/devel/gnome-build/files/patch-src::backends::libgbf_am::gbf-am-build.c b/devel/gnome-build/files/patch-src::backends::libgbf_am::gbf-am-build.c deleted file mode 100644 index 4c8380eb3706..000000000000 --- a/devel/gnome-build/files/patch-src::backends::libgbf_am::gbf-am-build.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/backends/libgbf_am/gbf-am-build.c.orig Thu Oct 16 11:34:19 2003 -+++ src/backends/libgbf_am/gbf-am-build.c Thu Oct 16 11:35:42 2003 -@@ -27,9 +27,9 @@ - #include <stdlib.h> - #include <unistd.h> - #include <string.h> --#include <regex.h> - #include "gbf-i18n.h" - #include "gbf-am-build.h" -+#include <gnuregex.h> - - /* FIXME: mark strings for translation and this file to POTFILES.in */ - diff --git a/devel/gnome-build/files/patch-src_backends_libgbf_mkfile_gbf-mkfile-build.c b/devel/gnome-build/files/patch-src_backends_libgbf_mkfile_gbf-mkfile-build.c deleted file mode 100644 index 698c8f484da1..000000000000 --- a/devel/gnome-build/files/patch-src_backends_libgbf_mkfile_gbf-mkfile-build.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/backends/libgbf_mkfile/gbf-mkfile-build.c.orig Mon May 15 18:06:23 2006 -+++ src/backends/libgbf_mkfile/gbf-mkfile-build.c Mon May 15 18:07:32 2006 -@@ -32,7 +32,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <string.h> --#include <regex.h> - #include "gbf-i18n.h" - #include "gbf-mkfile-build.h" -+#include <gnuregex.h> - diff --git a/devel/gnome-build/pkg-plist b/devel/gnome-build/pkg-plist index 73d5c908782f..60ff88f77411 100644 --- a/devel/gnome-build/pkg-plist +++ b/devel/gnome-build/pkg-plist @@ -1,7 +1,6 @@ bin/gbf-am-parse bin/gbf-mkfile-parse include/gnome-build-1.0/gbf/gbf-backend.h -include/gnome-build-1.0/gbf/gbf-build-info.h include/gnome-build-1.0/gbf/gbf-project-model.h include/gnome-build-1.0/gbf/gbf-project-util.h include/gnome-build-1.0/gbf/gbf-project-view.h @@ -17,10 +16,10 @@ lib/gnome-build-1.0/backends/libgbf-mkfile.la lib/gnome-build-1.0/backends/libgbf-mkfile.so lib/libgbf-1.la lib/libgbf-1.so -lib/libgbf-1.so.1 +lib/libgbf-1.so.2 lib/libgbf-widgets-1.la lib/libgbf-widgets-1.so -lib/libgbf-widgets-1.so.1 +lib/libgbf-widgets-1.so.2 libdata/pkgconfig/gnome-build-1.0.pc share/gnome-build/GBF/AmFiles.pm share/gnome-build/GBF/General.pm @@ -34,16 +33,19 @@ share/locale/be/LC_MESSAGES/gbf-1.mo share/locale/bg/LC_MESSAGES/gbf-1.mo share/locale/ca/LC_MESSAGES/gbf-1.mo share/locale/cs/LC_MESSAGES/gbf-1.mo +share/locale/da/LC_MESSAGES/gbf-1.mo share/locale/de/LC_MESSAGES/gbf-1.mo share/locale/dz/LC_MESSAGES/gbf-1.mo share/locale/el/LC_MESSAGES/gbf-1.mo share/locale/en_CA/LC_MESSAGES/gbf-1.mo share/locale/en_GB/LC_MESSAGES/gbf-1.mo share/locale/es/LC_MESSAGES/gbf-1.mo +share/locale/et/LC_MESSAGES/gbf-1.mo share/locale/eu/LC_MESSAGES/gbf-1.mo share/locale/fi/LC_MESSAGES/gbf-1.mo share/locale/fr/LC_MESSAGES/gbf-1.mo share/locale/gl/LC_MESSAGES/gbf-1.mo +share/locale/gu/LC_MESSAGES/gbf-1.mo share/locale/he/LC_MESSAGES/gbf-1.mo share/locale/hi/LC_MESSAGES/gbf-1.mo share/locale/hr/LC_MESSAGES/gbf-1.mo @@ -55,10 +57,12 @@ share/locale/lt/LC_MESSAGES/gbf-1.mo share/locale/lv/LC_MESSAGES/gbf-1.mo share/locale/mk/LC_MESSAGES/gbf-1.mo share/locale/ml/LC_MESSAGES/gbf-1.mo +share/locale/mr/LC_MESSAGES/gbf-1.mo share/locale/ms/LC_MESSAGES/gbf-1.mo share/locale/nb/LC_MESSAGES/gbf-1.mo share/locale/ne/LC_MESSAGES/gbf-1.mo share/locale/nl/LC_MESSAGES/gbf-1.mo +share/locale/nn/LC_MESSAGES/gbf-1.mo share/locale/oc/LC_MESSAGES/gbf-1.mo share/locale/pa/LC_MESSAGES/gbf-1.mo share/locale/pl/LC_MESSAGES/gbf-1.mo @@ -71,13 +75,15 @@ share/locale/sk/LC_MESSAGES/gbf-1.mo share/locale/sl/LC_MESSAGES/gbf-1.mo share/locale/sq/LC_MESSAGES/gbf-1.mo share/locale/sr/LC_MESSAGES/gbf-1.mo -share/locale/sr@Latn/LC_MESSAGES/gbf-1.mo +share/locale/sr@latin/LC_MESSAGES/gbf-1.mo share/locale/sv/LC_MESSAGES/gbf-1.mo share/locale/th/LC_MESSAGES/gbf-1.mo share/locale/tr/LC_MESSAGES/gbf-1.mo share/locale/uk/LC_MESSAGES/gbf-1.mo share/locale/vi/LC_MESSAGES/gbf-1.mo share/locale/zh_CN/LC_MESSAGES/gbf-1.mo +share/locale/zh_HK/LC_MESSAGES/gbf-1.mo +share/locale/zh_TW/LC_MESSAGES/gbf-1.mo share/pixmaps/gbf-build.png share/pixmaps/gbf-install.png @dirrm share/gnome-build/glade @@ -87,11 +93,17 @@ share/pixmaps/gbf-install.png @dirrm lib/gnome-build-1.0 @dirrm include/gnome-build-1.0/gbf @dirrm include/gnome-build-1.0 +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile index 45c002dc1d57..75aa7fa29037 100644 --- a/devel/gnome-common/Makefile +++ b/devel/gnome-common/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gnome-common/Makefile,v 1.7 2007/09/17 18:37:36 ahze Exp $ +# $MCom: ports/devel/gnome-common/Makefile,v 1.10 2008/09/27 01:52:59 mezz Exp $ # PORTNAME= gnome-common -PORTVERSION= 2.20.0 +PORTVERSION= 2.24.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -18,7 +18,7 @@ COMMENT= Common automake macros for GNOME and GNOME 2 USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig gnometarget +USE_GNOME= pkgconfig GNU_CONFIGURE= yes .include <bsd.port.mk> diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo index 394b5ed28354..dea6ccade4f9 100644 --- a/devel/gnome-common/distinfo +++ b/devel/gnome-common/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-common-2.20.0.tar.bz2) = 89e47677fb72695c75d2cefac84ff9f1 -SHA256 (gnome2/gnome-common-2.20.0.tar.bz2) = 0e807cfe74a684c494a0949b7f96d231660f323253a89053e3ec32c4f518c8d9 -SIZE (gnome2/gnome-common-2.20.0.tar.bz2) = 64309 +MD5 (gnome2/gnome-common-2.24.0.tar.bz2) = f72230d19ab9f2fa8923dcb078c69e9a +SHA256 (gnome2/gnome-common-2.24.0.tar.bz2) = e36fc07118e9d3cc0a4808cfbc6bfbd03ab5ba1ce0a311df9573dbbc0d189bac +SIZE (gnome2/gnome-common-2.24.0.tar.bz2) = 64560 diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 5ec27ed4142f..cee963b7593c 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/Makefile,v 1.182 2008/03/10 23:08:21 ahze Exp $ +# $MCom: ports/devel/gnome-vfs/Makefile,v 1.185 2008/09/22 10:26:54 kwm Exp $ # PORTNAME= gnome-vfs -PORTVERSION= 2.22.0 -PORTREVISION?= 2 +PORTVERSION= 2.24.0 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 71b68d87f596..0b2dc3c17e30 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-vfs-2.22.0.tar.bz2) = 369105fd82cb99e69e63acab8f3b89b7 -SHA256 (gnome2/gnome-vfs-2.22.0.tar.bz2) = 622cf50cefa2c4187e0a23f29d665f010f7a0815864fc35a61caefd5a7d4ebb1 -SIZE (gnome2/gnome-vfs-2.22.0.tar.bz2) = 1939765 +MD5 (gnome2/gnome-vfs-2.24.0.tar.bz2) = 870ee8861bfcaeb852934e95657ef83e +SHA256 (gnome2/gnome-vfs-2.24.0.tar.bz2) = b8ae3c81a2d6a3798534e72216899021013b47bc012e405fa00167d190559d94 +SIZE (gnome2/gnome-vfs-2.24.0.tar.bz2) = 1935735 diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h index 69292f2f1a16..7d987f400d90 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h @@ -1,25 +1,12 @@ ---- libgnomevfs/xdgmimecache.h.orig Mon May 29 20:04:24 2006 -+++ libgnomevfs/xdgmimecache.h Mon May 29 20:11:42 2006 -@@ -32,9 +32,19 @@ - typedef struct _XdgMimeCache XdgMimeCache; - - #ifdef XDG_PREFIX --#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file) --#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref) --#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref) -+#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file) -+#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref) -+#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref) -+#define _xdg_mime_cache_get_mime_type_for_data XDG_ENTRY(cache_get_mime_type_for_data) -+#define _xdg_mime_cache_get_mime_type_for_file XDG_ENTRY(cache_get_mime_type_for_file) -+#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name) -+#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type) -+#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal) -+#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal) -+#define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass) -+#define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents) -+#define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type) -+#define _xdg_mime_cache_get_max_buffer_extents XDG_ENTRY(cache_get_max_buffer_extents) +--- libgnomevfs/xdgmimecache.h.orig 2008-06-12 10:25:40.000000000 -0400 ++++ libgnomevfs/xdgmimecache.h 2008-06-14 00:49:59.000000000 -0400 +@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach + #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) + #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) + #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) ++#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) ++#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) ++#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) #endif extern XdgMimeCache **_caches; diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in index f8b22aaaf1b4..402f3449c6f9 100644 --- a/devel/gnome-vfs/pkg-deinstall.in +++ b/devel/gnome-vfs/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.17 2008/01/30 17:29:15 mezz Exp $ +# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.20 2008/08/06 04:22:49 mezz Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in index 72da3bf8ba79..19bf94479dab 100644 --- a/devel/gnome-vfs/pkg-install.in +++ b/devel/gnome-vfs/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.17 2008/01/30 17:29:15 mezz Exp $ +# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.20 2008/08/06 04:22:49 mezz Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index d1e23ffc8251..6625cbfc171a 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -151,6 +151,7 @@ share/locale/ku/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/mai/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mg/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo @@ -175,7 +176,7 @@ share/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/sr@latin/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo @@ -206,6 +207,8 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo @dirrmtry share/locale/xh @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/rw/LC_MESSAGES @@ -218,6 +221,8 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile index e9a6928b6669..4a5a2837525b 100644 --- a/devel/gnome-vfsmm/Makefile +++ b/devel/gnome-vfsmm/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.27 2008/03/08 16:44:51 marcus Exp $ +# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.29 2008/09/22 11:45:51 kwm Exp $ # PORTNAME= gnome-vfsmm -PORTVERSION= 2.22.0 -PORTREVISION= 1 +PORTVERSION= 2.24.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo index 20c4c5507789..857e752d8804 100644 --- a/devel/gnome-vfsmm/distinfo +++ b/devel/gnome-vfsmm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-vfsmm-2.22.0.tar.bz2) = 80b86e6f88ee0bd3a1babb686d0be03a -SHA256 (gnome2/gnome-vfsmm-2.22.0.tar.bz2) = 0e5d4e55aef65c5144217d4136ac2924f9c1a11f83e7dab13a4e0082e183fa92 -SIZE (gnome2/gnome-vfsmm-2.22.0.tar.bz2) = 354127 +MD5 (gnome2/gnome-vfsmm-2.24.0.tar.bz2) = f02257451583832c4d67f4accba7ad62 +SHA256 (gnome2/gnome-vfsmm-2.24.0.tar.bz2) = ab2fd9067d631254543f5dd33edf0649983e53073cfc697ce7de5157d4ba80ae +SIZE (gnome2/gnome-vfsmm-2.24.0.tar.bz2) = 359035 diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile index 74ba7798298f..853daae75d63 100644 --- a/devel/goffice/Makefile +++ b/devel/goffice/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/goffice/Makefile,v 1.32 2007/09/06 05:01:28 marcus Exp $ +# $MCom: ports/devel/goffice/Makefile,v 1.35 2008/10/20 18:13:37 kwm Exp $ # PORTNAME= goffice -PORTVERSION= 0.6.5 +PORTVERSION= 0.7.2 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -26,6 +26,8 @@ USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION=${PORTVERSION} - +PLIST_SUB= VERSION=${PORTVERSION} \ + SHORT_VER=0.8 +# SHORT_VER=${PORTVERSION:R} + .include <bsd.port.mk> diff --git a/devel/goffice/distinfo b/devel/goffice/distinfo index 9415b8d01277..9125ce83b5ab 100644 --- a/devel/goffice/distinfo +++ b/devel/goffice/distinfo @@ -1,3 +1,3 @@ -MD5 (goffice-0.6.5.tar.bz2) = ab0cf11995b7750f26112669cedf6707 -SHA256 (goffice-0.6.5.tar.bz2) = 15f3454820f8d29cfd724614bcfbe067b39ae33220ffcd1af778e112395a05c5 -SIZE (goffice-0.6.5.tar.bz2) = 1993186 +MD5 (goffice-0.7.2.tar.bz2) = f393f27dbab3b9efd92fe93633ddbfd6 +SHA256 (goffice-0.7.2.tar.bz2) = b885420c0e6a297239dbdc545cb8588dde81cb58034e1fc7e455a873f1cf39e4 +SIZE (goffice-0.7.2.tar.bz2) = 2071249 diff --git a/devel/goffice/pkg-plist b/devel/goffice/pkg-plist index 5e44b5fc0726..3ee5d5c04eec 100644 --- a/devel/goffice/pkg-plist +++ b/devel/goffice/pkg-plist @@ -1,143 +1,152 @@ -include/libgoffice-0.6/goffice/app/error-info.h -include/libgoffice-0.6/goffice/app/file.h -include/libgoffice-0.6/goffice/app/go-cmd-context-impl.h -include/libgoffice-0.6/goffice/app/go-cmd-context.h -include/libgoffice-0.6/goffice/app/go-doc-control-impl.h -include/libgoffice-0.6/goffice/app/go-doc-control.h -include/libgoffice-0.6/goffice/app/go-doc-impl.h -include/libgoffice-0.6/goffice/app/go-doc.h -include/libgoffice-0.6/goffice/app/go-plugin-loader-module.h -include/libgoffice-0.6/goffice/app/go-plugin-loader.h -include/libgoffice-0.6/goffice/app/go-plugin-service-impl.h -include/libgoffice-0.6/goffice/app/go-plugin-service.h -include/libgoffice-0.6/goffice/app/go-plugin.h -include/libgoffice-0.6/goffice/app/goffice-app.h -include/libgoffice-0.6/goffice/app/io-context-priv.h -include/libgoffice-0.6/goffice/app/io-context.h -include/libgoffice-0.6/goffice/app/module-plugin-defs.h -include/libgoffice-0.6/goffice/component/go-component-factory.h -include/libgoffice-0.6/goffice/component/go-component.h -include/libgoffice-0.6/goffice/component/goffice-component.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-line.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-text.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-util.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/libfoocanvas.h -include/libgoffice-0.6/goffice/data/go-data-impl.h -include/libgoffice-0.6/goffice/data/go-data-simple.h -include/libgoffice-0.6/goffice/data/go-data.h -include/libgoffice-0.6/goffice/data/goffice-data.h -include/libgoffice-0.6/goffice/drawing/god-anchor.h -include/libgoffice-0.6/goffice/drawing/god-default-attributes.h -include/libgoffice-0.6/goffice/drawing/god-drawing-group.h -include/libgoffice-0.6/goffice/drawing/god-drawing-renderer-gdk.h -include/libgoffice-0.6/goffice/drawing/god-drawing-view.h -include/libgoffice-0.6/goffice/drawing/god-drawing.h -include/libgoffice-0.6/goffice/drawing/god-image-store.h -include/libgoffice-0.6/goffice/drawing/god-image.h -include/libgoffice-0.6/goffice/drawing/god-paragraph-attributes.h -include/libgoffice-0.6/goffice/drawing/god-property-table.h -include/libgoffice-0.6/goffice/drawing/god-shape.h -include/libgoffice-0.6/goffice/drawing/god-text-model.h -include/libgoffice-0.6/goffice/goffice-features.h -include/libgoffice-0.6/goffice/goffice.h -include/libgoffice-0.6/goffice/graph/goffice-graph.h -include/libgoffice-0.6/goffice/graph/gog-axis-line-impl.h -include/libgoffice-0.6/goffice/graph/gog-axis-line.h -include/libgoffice-0.6/goffice/graph/gog-axis.h -include/libgoffice-0.6/goffice/graph/gog-chart-impl.h -include/libgoffice-0.6/goffice/graph/gog-chart-map.h -include/libgoffice-0.6/goffice/graph/gog-chart.h -include/libgoffice-0.6/goffice/graph/gog-child-button.h -include/libgoffice-0.6/goffice/graph/gog-control-foocanvas.h -include/libgoffice-0.6/goffice/graph/gog-data-allocator.h -include/libgoffice-0.6/goffice/graph/gog-data-set.h -include/libgoffice-0.6/goffice/graph/gog-error-bar.h -include/libgoffice-0.6/goffice/graph/gog-graph-impl.h -include/libgoffice-0.6/goffice/graph/gog-graph.h -include/libgoffice-0.6/goffice/graph/gog-grid-line.h -include/libgoffice-0.6/goffice/graph/gog-grid.h -include/libgoffice-0.6/goffice/graph/gog-guru.h -include/libgoffice-0.6/goffice/graph/gog-label.h -include/libgoffice-0.6/goffice/graph/gog-legend.h -include/libgoffice-0.6/goffice/graph/gog-object-xml.h -include/libgoffice-0.6/goffice/graph/gog-object.h -include/libgoffice-0.6/goffice/graph/gog-outlined-object.h -include/libgoffice-0.6/goffice/graph/gog-plot-engine.h -include/libgoffice-0.6/goffice/graph/gog-plot-impl.h -include/libgoffice-0.6/goffice/graph/gog-plot.h -include/libgoffice-0.6/goffice/graph/gog-reg-curve.h -include/libgoffice-0.6/goffice/graph/gog-renderer.h -include/libgoffice-0.6/goffice/graph/gog-series-impl.h -include/libgoffice-0.6/goffice/graph/gog-series-lines.h -include/libgoffice-0.6/goffice/graph/gog-series.h -include/libgoffice-0.6/goffice/graph/gog-smoothed-curve.h -include/libgoffice-0.6/goffice/graph/gog-style.h -include/libgoffice-0.6/goffice/graph/gog-styled-object.h -include/libgoffice-0.6/goffice/graph/gog-theme.h -include/libgoffice-0.6/goffice/graph/gog-trend-line.h -include/libgoffice-0.6/goffice/graph/gog-view.h -include/libgoffice-0.6/goffice/gtk/go-action-combo-color.h -include/libgoffice-0.6/goffice/gtk/go-action-combo-pixmaps.h -include/libgoffice-0.6/goffice/gtk/go-action-combo-stack.h -include/libgoffice-0.6/goffice/gtk/go-action-combo-text.h -include/libgoffice-0.6/goffice/gtk/go-charmap-sel.h -include/libgoffice-0.6/goffice/gtk/go-color-group.h -include/libgoffice-0.6/goffice/gtk/go-color-palette.h -include/libgoffice-0.6/goffice/gtk/go-color-selector.h -include/libgoffice-0.6/goffice/gtk/go-combo-box.h -include/libgoffice-0.6/goffice/gtk/go-combo-color.h -include/libgoffice-0.6/goffice/gtk/go-combo-pixmaps.h -include/libgoffice-0.6/goffice/gtk/go-combo-text.h -include/libgoffice-0.6/goffice/gtk/go-font-sel.h -include/libgoffice-0.6/goffice/gtk/go-format-sel.h -include/libgoffice-0.6/goffice/gtk/go-gradient-selector.h -include/libgoffice-0.6/goffice/gtk/go-graph-widget.h -include/libgoffice-0.6/goffice/gtk/go-line-selector.h -include/libgoffice-0.6/goffice/gtk/go-locale-sel.h -include/libgoffice-0.6/goffice/gtk/go-marker-selector.h -include/libgoffice-0.6/goffice/gtk/go-optionmenu.h -include/libgoffice-0.6/goffice/gtk/go-palette.h -include/libgoffice-0.6/goffice/gtk/go-pattern-selector.h -include/libgoffice-0.6/goffice/gtk/go-pixbuf.h -include/libgoffice-0.6/goffice/gtk/go-rotation-sel.h -include/libgoffice-0.6/goffice/gtk/go-selector.h -include/libgoffice-0.6/goffice/gtk/goffice-gtk.h -include/libgoffice-0.6/goffice/math/go-complex.h -include/libgoffice-0.6/goffice/math/go-cspline.h -include/libgoffice-0.6/goffice/math/go-fft.h -include/libgoffice-0.6/goffice/math/go-math.h -include/libgoffice-0.6/goffice/math/go-rangefunc.h -include/libgoffice-0.6/goffice/math/go-regression.h -include/libgoffice-0.6/goffice/ms-compat/go-ms-parser.h -include/libgoffice-0.6/goffice/ms-compat/god-drawing-ms-client-handler.h -include/libgoffice-0.6/goffice/ms-compat/god-drawing-ms.h -include/libgoffice-0.6/goffice/ms-compat/god-image-ms.h -include/libgoffice-0.6/goffice/utils/datetime.h -include/libgoffice-0.6/goffice/utils/go-cairo.h -include/libgoffice-0.6/goffice/utils/go-color.h -include/libgoffice-0.6/goffice/utils/go-file.h -include/libgoffice-0.6/goffice/utils/go-font.h -include/libgoffice-0.6/goffice/utils/go-format.h -include/libgoffice-0.6/goffice/utils/go-geometry.h -include/libgoffice-0.6/goffice/utils/go-glib-extras.h -include/libgoffice-0.6/goffice/utils/go-gradient.h -include/libgoffice-0.6/goffice/utils/go-image.h -include/libgoffice-0.6/goffice/utils/go-libxml-extras.h -include/libgoffice-0.6/goffice/utils/go-line.h -include/libgoffice-0.6/goffice/utils/go-locale.h -include/libgoffice-0.6/goffice/utils/go-marker.h -include/libgoffice-0.6/goffice/utils/go-pango-extras.h -include/libgoffice-0.6/goffice/utils/go-path.h -include/libgoffice-0.6/goffice/utils/go-pattern.h -include/libgoffice-0.6/goffice/utils/go-undo.h -include/libgoffice-0.6/goffice/utils/go-units.h -include/libgoffice-0.6/goffice/utils/goffice-utils.h -include/libgoffice-0.6/goffice/utils/regutf8.h +include/libgoffice-%%SHORT_VER%%/goffice/app/error-info.h +include/libgoffice-%%SHORT_VER%%/goffice/app/file.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-cmd-context-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-cmd-context.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-conf.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc-control-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc-control.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-loader-module.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-loader.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-service-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-service.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin.h +include/libgoffice-%%SHORT_VER%%/goffice/app/goffice-app.h +include/libgoffice-%%SHORT_VER%%/goffice/app/io-context-priv.h +include/libgoffice-%%SHORT_VER%%/goffice/app/io-context.h +include/libgoffice-%%SHORT_VER%%/goffice/app/module-plugin-defs.h +include/libgoffice-%%SHORT_VER%%/goffice/component/go-component-factory.h +include/libgoffice-%%SHORT_VER%%/goffice/component/go-component.h +include/libgoffice-%%SHORT_VER%%/goffice/component/goffice-component.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-line.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-text.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-util.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/libfoocanvas.h +include/libgoffice-%%SHORT_VER%%/goffice/data/go-data-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/data/go-data-simple.h +include/libgoffice-%%SHORT_VER%%/goffice/data/go-data.h +include/libgoffice-%%SHORT_VER%%/goffice/data/goffice-data.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-anchor.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-default-attributes.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-group.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-renderer-gdk.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-view.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-image-store.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-image.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-paragraph-attributes.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-property-table.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-shape.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-text-model.h +include/libgoffice-%%SHORT_VER%%/goffice/goffice-features.h +include/libgoffice-%%SHORT_VER%%/goffice/goffice.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/goffice-graph.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-3d-box.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis-line-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis-line.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-map-3d.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-map.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-child-button.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-control-foocanvas.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-data-allocator.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-data-set.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-error-bar.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-graph-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-graph.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-grid-line.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-grid.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-guru.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-label.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-legend.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-object-xml.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-object.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-outlined-object.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-plot-engine.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-plot-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-plot.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-reg-curve.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-renderer.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-lines.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-smoothed-curve.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-style.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-styled-object.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-theme.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-trend-line.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-view.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-3d-rotation-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-color.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-pixmaps.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-stack.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-text.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-charmap-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-group.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-palette.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-selector.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-box.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-color.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-pixmaps.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-text.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-font-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-format-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-gradient-selector.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-graph-widget.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-image-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-line-selector.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-locale-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-marker-selector.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-optionmenu.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-palette.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-pattern-selector.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-pixbuf.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-rotation-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-selector.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/goffice-gtk.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-R.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-complex.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-cspline.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-distribution.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-fft.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-math.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-matrix3x3.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-rangefunc.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-regression.h +include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/go-ms-parser.h +include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-drawing-ms-client-handler.h +include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-drawing-ms.h +include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-image-ms.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/datetime.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-cairo.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-color.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-file.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-font.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-format.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-geometry.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-glib-extras.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-gradient.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-image.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-libxml-extras.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-line.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-locale.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-marker.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pango-extras.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-path.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pattern.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-persist.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-undo.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-units.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/goffice-utils.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/regutf8.h lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.a lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.la lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so @@ -145,12 +154,12 @@ lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-barcol-prefs.glade lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-minmax-prefs.glade lib/goffice/%%VERSION%%/plugins/plot_barcol/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_barcol/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.a -lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.la -lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.so -lib/goffice/%%VERSION%%/plugins/plot_boxes/gog-boxplot-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_boxes/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_boxes/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.a +lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.la +lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.so +lib/goffice/%%VERSION%%/plugins/plot_distrib/gog-boxplot-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_distrib/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_distrib/plugin.xml lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-prefs.glade lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-series.glade lib/goffice/%%VERSION%%/plugins/plot_pie/gog-ring-prefs.glade @@ -164,7 +173,8 @@ lib/goffice/%%VERSION%%/plugins/plot_radar/plugin.xml lib/goffice/%%VERSION%%/plugins/plot_radar/radar.a lib/goffice/%%VERSION%%/plugins/plot_radar/radar.la lib/goffice/%%VERSION%%/plugins/plot_radar/radar.so -lib/goffice/%%VERSION%%/plugins/plot_surface/gog-contour-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_surface/gog-xyz-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_surface/gog-xyz-surface-prefs.glade lib/goffice/%%VERSION%%/plugins/plot_surface/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_surface/plugin.xml lib/goffice/%%VERSION%%/plugins/plot_surface/surface.a @@ -195,109 +205,112 @@ lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.a lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.la lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so lib/goffice/%%VERSION%%/plugins/smoothing/types.xml -lib/libgoffice-0.6.a -lib/libgoffice-0.6.la -lib/libgoffice-0.6.so -lib/libgoffice-0.6.so.6 -libdata/pkgconfig/libgoffice-0.6.pc -share/doc/goffice-0.6/GOComboBox.html -share/doc/goffice-0.6/GOComponent.html -share/doc/goffice-0.6/GOOptionMenu.html -share/doc/goffice-0.6/GOPalette.html -share/doc/goffice-0.6/GOPluginLoader.html -share/doc/goffice-0.6/GOSelector.html -share/doc/goffice-0.6/GOUndoUnary.html -share/doc/goffice-0.6/GogDataAllocator.html -share/doc/goffice-0.6/GogDataset.html -share/doc/goffice-0.6/GogObject.html -share/doc/goffice-0.6/GogOutlinedView.html -share/doc/goffice-0.6/GogRegCurve.html -share/doc/goffice-0.6/GogSmoothedCurve.html -share/doc/goffice-0.6/GogStyledObject.html -share/doc/goffice-0.6/GogView.html -share/doc/goffice-0.6/ch01.html -share/doc/goffice-0.6/ch02.html -share/doc/goffice-0.6/ch03.html -share/doc/goffice-0.6/ch04.html -share/doc/goffice-0.6/ch05.html -share/doc/goffice-0.6/ch06.html -share/doc/goffice-0.6/ch07.html -share/doc/goffice-0.6/ch08.html -share/doc/goffice-0.6/ch09.html -share/doc/goffice-0.6/ch10.html -share/doc/goffice-0.6/ch11.html -share/doc/goffice-0.6/ch12.html -share/doc/goffice-0.6/ch13.html -share/doc/goffice-0.6/goffice-0.6.devhelp -share/doc/goffice-0.6/goffice-0.6.devhelp2 -share/doc/goffice-0.6/goffice-06-go-cairo.html -share/doc/goffice-0.6/goffice-06-go-charmap-sel.html -share/doc/goffice-0.6/goffice-06-go-cmd-context.html -share/doc/goffice-0.6/goffice-06-go-color.html -share/doc/goffice-0.6/goffice-06-go-combo-color.html -share/doc/goffice-0.6/goffice-06-go-combo-pixmaps.html -share/doc/goffice-0.6/goffice-06-go-combo-text.html -share/doc/goffice-0.6/goffice-06-go-complex.html -share/doc/goffice-0.6/goffice-06-go-component-factory.html -share/doc/goffice-0.6/goffice-06-go-data.html -share/doc/goffice-0.6/goffice-06-go-doc-control.html -share/doc/goffice-0.6/goffice-06-go-doc.html -share/doc/goffice-0.6/goffice-06-go-fft.html -share/doc/goffice-0.6/goffice-06-go-file.html -share/doc/goffice-0.6/goffice-06-go-font-sel.html -share/doc/goffice-0.6/goffice-06-go-font.html -share/doc/goffice-0.6/goffice-06-go-format-sel.html -share/doc/goffice-0.6/goffice-06-go-format.html -share/doc/goffice-0.6/goffice-06-go-geometry.html -share/doc/goffice-0.6/goffice-06-go-glib-extras.html -share/doc/goffice-0.6/goffice-06-go-gradient.html -share/doc/goffice-0.6/goffice-06-go-libxml-extras.html -share/doc/goffice-0.6/goffice-06-go-line.html -share/doc/goffice-0.6/goffice-06-go-locale-sel.html -share/doc/goffice-0.6/goffice-06-go-marker.html -share/doc/goffice-0.6/goffice-06-go-math.html -share/doc/goffice-0.6/goffice-06-go-path.html -share/doc/goffice-0.6/goffice-06-go-pattern.html -share/doc/goffice-0.6/goffice-06-go-plugin-loader-module.html -share/doc/goffice-0.6/goffice-06-go-plugin-service.html -share/doc/goffice-0.6/goffice-06-go-plugin.html -share/doc/goffice-0.6/goffice-06-go-regression.html -share/doc/goffice-0.6/goffice-06-go-rotation-sel.html -share/doc/goffice-0.6/goffice-06-go-units.html -share/doc/goffice-0.6/goffice-06-gog-axis-line.html -share/doc/goffice-0.6/goffice-06-gog-axis.html -share/doc/goffice-0.6/goffice-06-gog-chart-map.html -share/doc/goffice-0.6/goffice-06-gog-chart.html -share/doc/goffice-0.6/goffice-06-gog-control-foocanvas.html -share/doc/goffice-0.6/goffice-06-gog-error-bar.html -share/doc/goffice-0.6/goffice-06-gog-graph.html -share/doc/goffice-0.6/goffice-06-gog-grid-line.html -share/doc/goffice-0.6/goffice-06-gog-grid.html -share/doc/goffice-0.6/goffice-06-gog-guru.html -share/doc/goffice-0.6/goffice-06-gog-label.html -share/doc/goffice-0.6/goffice-06-gog-legend.html -share/doc/goffice-0.6/goffice-06-gog-plot-engine.html -share/doc/goffice-0.6/goffice-06-gog-plot.html -share/doc/goffice-0.6/goffice-06-gog-renderer.html -share/doc/goffice-0.6/goffice-06-gog-series-lines.html -share/doc/goffice-0.6/goffice-06-gog-series.html -share/doc/goffice-0.6/goffice-06-gog-style.html -share/doc/goffice-0.6/goffice-06-gog-theme.html -share/doc/goffice-0.6/goffice-06-gog-trend-line.html -share/doc/goffice-0.6/home.png -share/doc/goffice-0.6/index.html -share/doc/goffice-0.6/index.sgml -share/doc/goffice-0.6/left.png -share/doc/goffice-0.6/pt01.html -share/doc/goffice-0.6/pt02.html -share/doc/goffice-0.6/pt03.html -share/doc/goffice-0.6/right.png -share/doc/goffice-0.6/style.css -share/doc/goffice-0.6/up.png +lib/libgoffice-%%SHORT_VER%%.a +lib/libgoffice-%%SHORT_VER%%.la +lib/libgoffice-%%SHORT_VER%%.so +lib/libgoffice-%%SHORT_VER%%.so.7 +libdata/pkgconfig/libgoffice-%%SHORT_VER%%.pc +%%DOCSDIR%%-%%SHORT_VER%%/GOComboBox.html +%%DOCSDIR%%-%%SHORT_VER%%/GOComponent.html +%%DOCSDIR%%-%%SHORT_VER%%/GOOptionMenu.html +%%DOCSDIR%%-%%SHORT_VER%%/GOPalette.html +%%DOCSDIR%%-%%SHORT_VER%%/GOPluginLoader.html +%%DOCSDIR%%-%%SHORT_VER%%/GOSelector.html +%%DOCSDIR%%-%%SHORT_VER%%/GOUndoUnary.html +%%DOCSDIR%%-%%SHORT_VER%%/GogDataAllocator.html +%%DOCSDIR%%-%%SHORT_VER%%/GogDataset.html +%%DOCSDIR%%-%%SHORT_VER%%/GogObject.html +%%DOCSDIR%%-%%SHORT_VER%%/GogOutlinedView.html +%%DOCSDIR%%-%%SHORT_VER%%/GogRegCurve.html +%%DOCSDIR%%-%%SHORT_VER%%/GogSmoothedCurve.html +%%DOCSDIR%%-%%SHORT_VER%%/GogStyledObject.html +%%DOCSDIR%%-%%SHORT_VER%%/GogView.html +%%DOCSDIR%%-%%SHORT_VER%%/ch01.html +%%DOCSDIR%%-%%SHORT_VER%%/ch02.html +%%DOCSDIR%%-%%SHORT_VER%%/ch03.html +%%DOCSDIR%%-%%SHORT_VER%%/ch04.html +%%DOCSDIR%%-%%SHORT_VER%%/ch05.html +%%DOCSDIR%%-%%SHORT_VER%%/ch06.html +%%DOCSDIR%%-%%SHORT_VER%%/ch07.html +%%DOCSDIR%%-%%SHORT_VER%%/ch08.html +%%DOCSDIR%%-%%SHORT_VER%%/ch09.html +%%DOCSDIR%%-%%SHORT_VER%%/ch10.html +%%DOCSDIR%%-%%SHORT_VER%%/ch11.html +%%DOCSDIR%%-%%SHORT_VER%%/ch12.html +%%DOCSDIR%%-%%SHORT_VER%%/ch13.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-%%SHORT_VER%%.devhelp +%%DOCSDIR%%-%%SHORT_VER%%/goffice-%%SHORT_VER%%.devhelp2 +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-cairo.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-charmap-sel.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-cmd-context.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-color.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-combo-color.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-combo-pixmaps.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-combo-text.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-complex.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-component-factory.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-data.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-doc-control.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-doc.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-fft.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-file.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-font-sel.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-font.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-format-sel.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-format.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-geometry.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-glib-extras.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-gradient.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-libxml-extras.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-line.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-locale-sel.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-marker.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-math.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-path.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-pattern.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-plugin-loader-module.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-plugin-service.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-plugin.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-regression.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-rotation-sel.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-units.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-axis-line.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-axis.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-chart-map.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-chart.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-control-foocanvas.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-error-bar.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-graph.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-grid-line.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-grid.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-guru.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-label.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-legend.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-plot-engine.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-plot.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-renderer.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-series-lines.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-series.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-style.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-theme.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-trend-line.html +%%DOCSDIR%%-%%SHORT_VER%%/home.png +%%DOCSDIR%%-%%SHORT_VER%%/index.html +%%DOCSDIR%%-%%SHORT_VER%%/index.sgml +%%DOCSDIR%%-%%SHORT_VER%%/left.png +%%DOCSDIR%%-%%SHORT_VER%%/pt01.html +%%DOCSDIR%%-%%SHORT_VER%%/pt02.html +%%DOCSDIR%%-%%SHORT_VER%%/pt03.html +%%DOCSDIR%%-%%SHORT_VER%%/right.png +%%DOCSDIR%%-%%SHORT_VER%%/style.css +%%DOCSDIR%%-%%SHORT_VER%%/up.png +%%DATADIR%%/%%VERSION%%/glade/go-3d-rotation-sel.glade %%DATADIR%%/%%VERSION%%/glade/go-font-sel.glade %%DATADIR%%/%%VERSION%%/glade/go-format-sel.glade %%DATADIR%%/%%VERSION%%/glade/go-image-save-dialog-extra.glade +%%DATADIR%%/%%VERSION%%/glade/go-image-sel.glade %%DATADIR%%/%%VERSION%%/glade/go-rotation-sel.glade +%%DATADIR%%/%%VERSION%%/glade/gog-3d-box-prefs.glade %%DATADIR%%/%%VERSION%%/glade/gog-axis-prefs.glade %%DATADIR%%/%%VERSION%%/glade/gog-error-bar-prefs.glade %%DATADIR%%/%%VERSION%%/glade/gog-graph-prefs.glade @@ -366,7 +379,6 @@ share/pixmaps/goffice/%%VERSION%%/bar-vboth.png share/pixmaps/goffice/%%VERSION%%/bar-vminus.png share/pixmaps/goffice/%%VERSION%%/bar-vplus.png share/pixmaps/goffice/%%VERSION%%/bar.xpm -share/pixmaps/goffice/%%VERSION%%/boxplot.xpm share/pixmaps/goffice/%%VERSION%%/bubble.xpm share/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png share/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png @@ -428,6 +440,7 @@ share/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png share/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png share/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png share/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_prob_1_1.png share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png @@ -455,11 +468,13 @@ share/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png share/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png share/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png share/pixmaps/goffice/%%VERSION%%/chart_surface_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_surface_2_2.png share/pixmaps/goffice/%%VERSION%%/color.xpm share/pixmaps/goffice/%%VERSION%%/column.xpm +share/pixmaps/goffice/%%VERSION%%/contour.xpm +share/pixmaps/goffice/%%VERSION%%/dist.xpm share/pixmaps/goffice/%%VERSION%%/doughnut.xpm share/pixmaps/goffice/%%VERSION%%/dropbar.xpm -share/pixmaps/goffice/%%VERSION%%/hist.xpm share/pixmaps/goffice/%%VERSION%%/linegraph.xpm share/pixmaps/goffice/%%VERSION%%/minmax.xpm share/pixmaps/goffice/%%VERSION%%/pie.xpm @@ -469,18 +484,12 @@ share/pixmaps/goffice/%%VERSION%%/scatter.xpm share/pixmaps/goffice/%%VERSION%%/stock.xpm share/pixmaps/goffice/%%VERSION%%/surface.xpm @dirrm share/pixmaps/goffice/%%VERSION%% -@dirrm share/pixmaps/goffice -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr +@dirrmtry share/pixmaps/goffice @dirrm %%DATADIR%%/%%VERSION%%/patterns @dirrm %%DATADIR%%/%%VERSION%%/glade @dirrm %%DATADIR%%/%%VERSION%% -@dirrm %%DATADIR%% -@dirrm share/doc/goffice-0.6 +@dirrmtry %%DATADIR%% +@dirrm %%DOCSDIR%%-%%SHORT_VER%% @dirrm lib/goffice/%%VERSION%%/plugins/smoothing @dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit @dirrm lib/goffice/%%VERSION%%/plugins/reg_linear @@ -488,21 +497,27 @@ share/pixmaps/goffice/%%VERSION%%/surface.xpm @dirrm lib/goffice/%%VERSION%%/plugins/plot_surface @dirrm lib/goffice/%%VERSION%%/plugins/plot_radar @dirrm lib/goffice/%%VERSION%%/plugins/plot_pie -@dirrm lib/goffice/%%VERSION%%/plugins/plot_boxes +@dirrm lib/goffice/%%VERSION%%/plugins/plot_distrib @dirrm lib/goffice/%%VERSION%%/plugins/plot_barcol @dirrm lib/goffice/%%VERSION%%/plugins @dirrm lib/goffice/%%VERSION%% @dirrmtry lib/goffice -@dirrm include/libgoffice-0.6/goffice/utils -@dirrm include/libgoffice-0.6/goffice/ms-compat -@dirrm include/libgoffice-0.6/goffice/math -@dirrm include/libgoffice-0.6/goffice/gtk -@dirrm include/libgoffice-0.6/goffice/graph -@dirrm include/libgoffice-0.6/goffice/drawing -@dirrm include/libgoffice-0.6/goffice/data -@dirrm include/libgoffice-0.6/goffice/cut-n-paste/foocanvas -@dirrm include/libgoffice-0.6/goffice/cut-n-paste -@dirrm include/libgoffice-0.6/goffice/component -@dirrm include/libgoffice-0.6/goffice/app -@dirrm include/libgoffice-0.6/goffice -@dirrm include/libgoffice-0.6 +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/utils +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/ms-compat +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/math +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/gtk +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/graph +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/drawing +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/data +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/component +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/app +@dirrm include/libgoffice-%%SHORT_VER%%/goffice +@dirrm include/libgoffice-%%SHORT_VER%% +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr diff --git a/devel/goffice06/Makefile b/devel/goffice06/Makefile new file mode 100644 index 000000000000..ada358a453a5 --- /dev/null +++ b/devel/goffice06/Makefile @@ -0,0 +1,33 @@ +# New ports collection makefile for: goffice +# Date created: 07 June 2005 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/devel/goffice06/Makefile,v 1.1 2008/09/09 00:10:24 kwm Exp $ +# + +PORTNAME= goffice +PORTVERSION= 0.6.5 +CATEGORIES= devel gnome +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GLib/GTK+ set of document centric objects and utilities + +LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre + +NO_LATEST_LINK= yes + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ + libgsf_gnome libgnomeui ltverhack +USE_GETTEXT= yes +USE_AUTOTOOLS= libtool:15 +USE_LDCONFIG= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +PLIST_SUB= VERSION=${PORTVERSION} + +.include <bsd.port.mk> diff --git a/devel/goffice06/distinfo b/devel/goffice06/distinfo new file mode 100644 index 000000000000..9415b8d01277 --- /dev/null +++ b/devel/goffice06/distinfo @@ -0,0 +1,3 @@ +MD5 (goffice-0.6.5.tar.bz2) = ab0cf11995b7750f26112669cedf6707 +SHA256 (goffice-0.6.5.tar.bz2) = 15f3454820f8d29cfd724614bcfbe067b39ae33220ffcd1af778e112395a05c5 +SIZE (goffice-0.6.5.tar.bz2) = 1993186 diff --git a/devel/goffice06/pkg-descr b/devel/goffice06/pkg-descr new file mode 100644 index 000000000000..0d48f505271e --- /dev/null +++ b/devel/goffice06/pkg-descr @@ -0,0 +1,11 @@ +Goffice is a set of document centric components for GLib and GTK+. + +There are common operations for document centric applications that are +conceptually simple, but complex to implement fully. + - plugins + - load/save documents + - undo/redo + +Goffice provides a single library for performing such operations. + +WWW: http://live.gnome.org/libgoffice diff --git a/devel/goffice06/pkg-plist b/devel/goffice06/pkg-plist new file mode 100644 index 000000000000..271e89099305 --- /dev/null +++ b/devel/goffice06/pkg-plist @@ -0,0 +1,508 @@ +include/libgoffice-0.6/goffice/app/error-info.h +include/libgoffice-0.6/goffice/app/file.h +include/libgoffice-0.6/goffice/app/go-cmd-context-impl.h +include/libgoffice-0.6/goffice/app/go-cmd-context.h +include/libgoffice-0.6/goffice/app/go-doc-control-impl.h +include/libgoffice-0.6/goffice/app/go-doc-control.h +include/libgoffice-0.6/goffice/app/go-doc-impl.h +include/libgoffice-0.6/goffice/app/go-doc.h +include/libgoffice-0.6/goffice/app/go-plugin-loader-module.h +include/libgoffice-0.6/goffice/app/go-plugin-loader.h +include/libgoffice-0.6/goffice/app/go-plugin-service-impl.h +include/libgoffice-0.6/goffice/app/go-plugin-service.h +include/libgoffice-0.6/goffice/app/go-plugin.h +include/libgoffice-0.6/goffice/app/goffice-app.h +include/libgoffice-0.6/goffice/app/io-context-priv.h +include/libgoffice-0.6/goffice/app/io-context.h +include/libgoffice-0.6/goffice/app/module-plugin-defs.h +include/libgoffice-0.6/goffice/component/go-component-factory.h +include/libgoffice-0.6/goffice/component/go-component.h +include/libgoffice-0.6/goffice/component/goffice-component.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-line.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-text.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-util.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/libfoocanvas.h +include/libgoffice-0.6/goffice/data/go-data-impl.h +include/libgoffice-0.6/goffice/data/go-data-simple.h +include/libgoffice-0.6/goffice/data/go-data.h +include/libgoffice-0.6/goffice/data/goffice-data.h +include/libgoffice-0.6/goffice/drawing/god-anchor.h +include/libgoffice-0.6/goffice/drawing/god-default-attributes.h +include/libgoffice-0.6/goffice/drawing/god-drawing-group.h +include/libgoffice-0.6/goffice/drawing/god-drawing-renderer-gdk.h +include/libgoffice-0.6/goffice/drawing/god-drawing-view.h +include/libgoffice-0.6/goffice/drawing/god-drawing.h +include/libgoffice-0.6/goffice/drawing/god-image-store.h +include/libgoffice-0.6/goffice/drawing/god-image.h +include/libgoffice-0.6/goffice/drawing/god-paragraph-attributes.h +include/libgoffice-0.6/goffice/drawing/god-property-table.h +include/libgoffice-0.6/goffice/drawing/god-shape.h +include/libgoffice-0.6/goffice/drawing/god-text-model.h +include/libgoffice-0.6/goffice/goffice-features.h +include/libgoffice-0.6/goffice/goffice.h +include/libgoffice-0.6/goffice/graph/goffice-graph.h +include/libgoffice-0.6/goffice/graph/gog-axis-line-impl.h +include/libgoffice-0.6/goffice/graph/gog-axis-line.h +include/libgoffice-0.6/goffice/graph/gog-axis.h +include/libgoffice-0.6/goffice/graph/gog-chart-impl.h +include/libgoffice-0.6/goffice/graph/gog-chart-map.h +include/libgoffice-0.6/goffice/graph/gog-chart.h +include/libgoffice-0.6/goffice/graph/gog-child-button.h +include/libgoffice-0.6/goffice/graph/gog-control-foocanvas.h +include/libgoffice-0.6/goffice/graph/gog-data-allocator.h +include/libgoffice-0.6/goffice/graph/gog-data-set.h +include/libgoffice-0.6/goffice/graph/gog-error-bar.h +include/libgoffice-0.6/goffice/graph/gog-graph-impl.h +include/libgoffice-0.6/goffice/graph/gog-graph.h +include/libgoffice-0.6/goffice/graph/gog-grid-line.h +include/libgoffice-0.6/goffice/graph/gog-grid.h +include/libgoffice-0.6/goffice/graph/gog-guru.h +include/libgoffice-0.6/goffice/graph/gog-label.h +include/libgoffice-0.6/goffice/graph/gog-legend.h +include/libgoffice-0.6/goffice/graph/gog-object-xml.h +include/libgoffice-0.6/goffice/graph/gog-object.h +include/libgoffice-0.6/goffice/graph/gog-outlined-object.h +include/libgoffice-0.6/goffice/graph/gog-plot-engine.h +include/libgoffice-0.6/goffice/graph/gog-plot-impl.h +include/libgoffice-0.6/goffice/graph/gog-plot.h +include/libgoffice-0.6/goffice/graph/gog-reg-curve.h +include/libgoffice-0.6/goffice/graph/gog-renderer.h +include/libgoffice-0.6/goffice/graph/gog-series-impl.h +include/libgoffice-0.6/goffice/graph/gog-series-lines.h +include/libgoffice-0.6/goffice/graph/gog-series.h +include/libgoffice-0.6/goffice/graph/gog-smoothed-curve.h +include/libgoffice-0.6/goffice/graph/gog-style.h +include/libgoffice-0.6/goffice/graph/gog-styled-object.h +include/libgoffice-0.6/goffice/graph/gog-theme.h +include/libgoffice-0.6/goffice/graph/gog-trend-line.h +include/libgoffice-0.6/goffice/graph/gog-view.h +include/libgoffice-0.6/goffice/gtk/go-action-combo-color.h +include/libgoffice-0.6/goffice/gtk/go-action-combo-pixmaps.h +include/libgoffice-0.6/goffice/gtk/go-action-combo-stack.h +include/libgoffice-0.6/goffice/gtk/go-action-combo-text.h +include/libgoffice-0.6/goffice/gtk/go-charmap-sel.h +include/libgoffice-0.6/goffice/gtk/go-color-group.h +include/libgoffice-0.6/goffice/gtk/go-color-palette.h +include/libgoffice-0.6/goffice/gtk/go-color-selector.h +include/libgoffice-0.6/goffice/gtk/go-combo-box.h +include/libgoffice-0.6/goffice/gtk/go-combo-color.h +include/libgoffice-0.6/goffice/gtk/go-combo-pixmaps.h +include/libgoffice-0.6/goffice/gtk/go-combo-text.h +include/libgoffice-0.6/goffice/gtk/go-font-sel.h +include/libgoffice-0.6/goffice/gtk/go-format-sel.h +include/libgoffice-0.6/goffice/gtk/go-gradient-selector.h +include/libgoffice-0.6/goffice/gtk/go-graph-widget.h +include/libgoffice-0.6/goffice/gtk/go-line-selector.h +include/libgoffice-0.6/goffice/gtk/go-locale-sel.h +include/libgoffice-0.6/goffice/gtk/go-marker-selector.h +include/libgoffice-0.6/goffice/gtk/go-optionmenu.h +include/libgoffice-0.6/goffice/gtk/go-palette.h +include/libgoffice-0.6/goffice/gtk/go-pattern-selector.h +include/libgoffice-0.6/goffice/gtk/go-pixbuf.h +include/libgoffice-0.6/goffice/gtk/go-rotation-sel.h +include/libgoffice-0.6/goffice/gtk/go-selector.h +include/libgoffice-0.6/goffice/gtk/goffice-gtk.h +include/libgoffice-0.6/goffice/math/go-complex.h +include/libgoffice-0.6/goffice/math/go-cspline.h +include/libgoffice-0.6/goffice/math/go-fft.h +include/libgoffice-0.6/goffice/math/go-math.h +include/libgoffice-0.6/goffice/math/go-rangefunc.h +include/libgoffice-0.6/goffice/math/go-regression.h +include/libgoffice-0.6/goffice/ms-compat/go-ms-parser.h +include/libgoffice-0.6/goffice/ms-compat/god-drawing-ms-client-handler.h +include/libgoffice-0.6/goffice/ms-compat/god-drawing-ms.h +include/libgoffice-0.6/goffice/ms-compat/god-image-ms.h +include/libgoffice-0.6/goffice/utils/datetime.h +include/libgoffice-0.6/goffice/utils/go-cairo.h +include/libgoffice-0.6/goffice/utils/go-color.h +include/libgoffice-0.6/goffice/utils/go-file.h +include/libgoffice-0.6/goffice/utils/go-font.h +include/libgoffice-0.6/goffice/utils/go-format.h +include/libgoffice-0.6/goffice/utils/go-geometry.h +include/libgoffice-0.6/goffice/utils/go-glib-extras.h +include/libgoffice-0.6/goffice/utils/go-gradient.h +include/libgoffice-0.6/goffice/utils/go-image.h +include/libgoffice-0.6/goffice/utils/go-libxml-extras.h +include/libgoffice-0.6/goffice/utils/go-line.h +include/libgoffice-0.6/goffice/utils/go-locale.h +include/libgoffice-0.6/goffice/utils/go-marker.h +include/libgoffice-0.6/goffice/utils/go-pango-extras.h +include/libgoffice-0.6/goffice/utils/go-path.h +include/libgoffice-0.6/goffice/utils/go-pattern.h +include/libgoffice-0.6/goffice/utils/go-undo.h +include/libgoffice-0.6/goffice/utils/go-units.h +include/libgoffice-0.6/goffice/utils/goffice-utils.h +include/libgoffice-0.6/goffice/utils/regutf8.h +lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.a +lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.la +lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so +lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-barcol-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-minmax-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_barcol/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_barcol/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.a +lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.la +lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.so +lib/goffice/%%VERSION%%/plugins/plot_boxes/gog-boxplot-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_boxes/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_boxes/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-series.glade +lib/goffice/%%VERSION%%/plugins/plot_pie/gog-ring-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_pie/pie.a +lib/goffice/%%VERSION%%/plugins/plot_pie/pie.la +lib/goffice/%%VERSION%%/plugins/plot_pie/pie.so +lib/goffice/%%VERSION%%/plugins/plot_pie/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_pie/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_radar/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_radar/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_radar/radar.a +lib/goffice/%%VERSION%%/plugins/plot_radar/radar.la +lib/goffice/%%VERSION%%/plugins/plot_radar/radar.so +lib/goffice/%%VERSION%%/plugins/plot_surface/gog-contour-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_surface/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_surface/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_surface/surface.a +lib/goffice/%%VERSION%%/plugins/plot_surface/surface.la +lib/goffice/%%VERSION%%/plugins/plot_surface/surface.so +lib/goffice/%%VERSION%%/plugins/plot_xy/gog-bubble-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-color-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-series-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_xy/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_xy/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_xy/xy.a +lib/goffice/%%VERSION%%/plugins/plot_xy/xy.la +lib/goffice/%%VERSION%%/plugins/plot_xy/xy.so +lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.a +lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.la +lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.so +lib/goffice/%%VERSION%%/plugins/reg_linear/plugin.xml +lib/goffice/%%VERSION%%/plugins/reg_linear/reg-types.xml +lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.a +lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.la +lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.so +lib/goffice/%%VERSION%%/plugins/reg_logfit/plugin.xml +lib/goffice/%%VERSION%%/plugins/reg_logfit/reg-types.xml +lib/goffice/%%VERSION%%/plugins/smoothing/gog-exp-smooth.glade +lib/goffice/%%VERSION%%/plugins/smoothing/gog-moving-avg.glade +lib/goffice/%%VERSION%%/plugins/smoothing/plugin.xml +lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.a +lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.la +lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so +lib/goffice/%%VERSION%%/plugins/smoothing/types.xml +lib/libgoffice-0.6.a +lib/libgoffice-0.6.la +lib/libgoffice-0.6.so +lib/libgoffice-0.6.so.6 +libdata/pkgconfig/libgoffice-0.6.pc +share/doc/goffice-0.6/GOComboBox.html +share/doc/goffice-0.6/GOComponent.html +share/doc/goffice-0.6/GOOptionMenu.html +share/doc/goffice-0.6/GOPalette.html +share/doc/goffice-0.6/GOPluginLoader.html +share/doc/goffice-0.6/GOSelector.html +share/doc/goffice-0.6/GOUndoUnary.html +share/doc/goffice-0.6/GogDataAllocator.html +share/doc/goffice-0.6/GogDataset.html +share/doc/goffice-0.6/GogObject.html +share/doc/goffice-0.6/GogOutlinedView.html +share/doc/goffice-0.6/GogRegCurve.html +share/doc/goffice-0.6/GogSmoothedCurve.html +share/doc/goffice-0.6/GogStyledObject.html +share/doc/goffice-0.6/GogView.html +share/doc/goffice-0.6/ch01.html +share/doc/goffice-0.6/ch02.html +share/doc/goffice-0.6/ch03.html +share/doc/goffice-0.6/ch04.html +share/doc/goffice-0.6/ch05.html +share/doc/goffice-0.6/ch06.html +share/doc/goffice-0.6/ch07.html +share/doc/goffice-0.6/ch08.html +share/doc/goffice-0.6/ch09.html +share/doc/goffice-0.6/ch10.html +share/doc/goffice-0.6/ch11.html +share/doc/goffice-0.6/ch12.html +share/doc/goffice-0.6/ch13.html +share/doc/goffice-0.6/goffice-0.6.devhelp +share/doc/goffice-0.6/goffice-0.6.devhelp2 +share/doc/goffice-0.6/goffice-06-go-cairo.html +share/doc/goffice-0.6/goffice-06-go-charmap-sel.html +share/doc/goffice-0.6/goffice-06-go-cmd-context.html +share/doc/goffice-0.6/goffice-06-go-color.html +share/doc/goffice-0.6/goffice-06-go-combo-color.html +share/doc/goffice-0.6/goffice-06-go-combo-pixmaps.html +share/doc/goffice-0.6/goffice-06-go-combo-text.html +share/doc/goffice-0.6/goffice-06-go-complex.html +share/doc/goffice-0.6/goffice-06-go-component-factory.html +share/doc/goffice-0.6/goffice-06-go-data.html +share/doc/goffice-0.6/goffice-06-go-doc-control.html +share/doc/goffice-0.6/goffice-06-go-doc.html +share/doc/goffice-0.6/goffice-06-go-fft.html +share/doc/goffice-0.6/goffice-06-go-file.html +share/doc/goffice-0.6/goffice-06-go-font-sel.html +share/doc/goffice-0.6/goffice-06-go-font.html +share/doc/goffice-0.6/goffice-06-go-format-sel.html +share/doc/goffice-0.6/goffice-06-go-format.html +share/doc/goffice-0.6/goffice-06-go-geometry.html +share/doc/goffice-0.6/goffice-06-go-glib-extras.html +share/doc/goffice-0.6/goffice-06-go-gradient.html +share/doc/goffice-0.6/goffice-06-go-libxml-extras.html +share/doc/goffice-0.6/goffice-06-go-line.html +share/doc/goffice-0.6/goffice-06-go-locale-sel.html +share/doc/goffice-0.6/goffice-06-go-marker.html +share/doc/goffice-0.6/goffice-06-go-math.html +share/doc/goffice-0.6/goffice-06-go-path.html +share/doc/goffice-0.6/goffice-06-go-pattern.html +share/doc/goffice-0.6/goffice-06-go-plugin-loader-module.html +share/doc/goffice-0.6/goffice-06-go-plugin-service.html +share/doc/goffice-0.6/goffice-06-go-plugin.html +share/doc/goffice-0.6/goffice-06-go-regression.html +share/doc/goffice-0.6/goffice-06-go-rotation-sel.html +share/doc/goffice-0.6/goffice-06-go-units.html +share/doc/goffice-0.6/goffice-06-gog-axis-line.html +share/doc/goffice-0.6/goffice-06-gog-axis.html +share/doc/goffice-0.6/goffice-06-gog-chart-map.html +share/doc/goffice-0.6/goffice-06-gog-chart.html +share/doc/goffice-0.6/goffice-06-gog-control-foocanvas.html +share/doc/goffice-0.6/goffice-06-gog-error-bar.html +share/doc/goffice-0.6/goffice-06-gog-graph.html +share/doc/goffice-0.6/goffice-06-gog-grid-line.html +share/doc/goffice-0.6/goffice-06-gog-grid.html +share/doc/goffice-0.6/goffice-06-gog-guru.html +share/doc/goffice-0.6/goffice-06-gog-label.html +share/doc/goffice-0.6/goffice-06-gog-legend.html +share/doc/goffice-0.6/goffice-06-gog-plot-engine.html +share/doc/goffice-0.6/goffice-06-gog-plot.html +share/doc/goffice-0.6/goffice-06-gog-renderer.html +share/doc/goffice-0.6/goffice-06-gog-series-lines.html +share/doc/goffice-0.6/goffice-06-gog-series.html +share/doc/goffice-0.6/goffice-06-gog-style.html +share/doc/goffice-0.6/goffice-06-gog-theme.html +share/doc/goffice-0.6/goffice-06-gog-trend-line.html +share/doc/goffice-0.6/home.png +share/doc/goffice-0.6/index.html +share/doc/goffice-0.6/index.sgml +share/doc/goffice-0.6/left.png +share/doc/goffice-0.6/pt01.html +share/doc/goffice-0.6/pt02.html +share/doc/goffice-0.6/pt03.html +share/doc/goffice-0.6/right.png +share/doc/goffice-0.6/style.css +share/doc/goffice-0.6/up.png +%%DATADIR%%/%%VERSION%%/glade/go-font-sel.glade +%%DATADIR%%/%%VERSION%%/glade/go-format-sel.glade +%%DATADIR%%/%%VERSION%%/glade/go-image-save-dialog-extra.glade +%%DATADIR%%/%%VERSION%%/glade/go-rotation-sel.glade +%%DATADIR%%/%%VERSION%%/glade/gog-axis-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-error-bar-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-graph-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-guru-type-selector.glade +%%DATADIR%%/%%VERSION%%/glade/gog-guru.glade +%%DATADIR%%/%%VERSION%%/glade/gog-object-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-plot-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-reg-curve-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-reg-eqn-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-series-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-style-prefs.glade +%%DATADIR%%/%%VERSION%%/patterns/svg-patterns.xml +share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ar/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ca/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/cs/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/de/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/et/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/fr/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ga/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/gl/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/he/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/hu/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/it/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ja/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ko/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/lv/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ml/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/mr/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ms/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/nb/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/nn/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/oc/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/pt/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ro/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ru/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/sv/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/tr/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/zh_HK/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo +share/pixmaps/goffice/%%VERSION%%/area.xpm +share/pixmaps/goffice/%%VERSION%%/bar-hboth.png +share/pixmaps/goffice/%%VERSION%%/bar-hminus.png +share/pixmaps/goffice/%%VERSION%%/bar-hplus.png +share/pixmaps/goffice/%%VERSION%%/bar-none.png +share/pixmaps/goffice/%%VERSION%%/bar-vboth.png +share/pixmaps/goffice/%%VERSION%%/bar-vminus.png +share/pixmaps/goffice/%%VERSION%%/bar-vplus.png +share/pixmaps/goffice/%%VERSION%%/bar.xpm +share/pixmaps/goffice/%%VERSION%%/boxplot.xpm +share/pixmaps/goffice/%%VERSION%%/bubble.xpm +share/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_boxplot_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_boxplot_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png +share/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png +share/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_surface_2_1.png +share/pixmaps/goffice/%%VERSION%%/color.xpm +share/pixmaps/goffice/%%VERSION%%/column.xpm +share/pixmaps/goffice/%%VERSION%%/doughnut.xpm +share/pixmaps/goffice/%%VERSION%%/dropbar.xpm +share/pixmaps/goffice/%%VERSION%%/hist.xpm +share/pixmaps/goffice/%%VERSION%%/linegraph.xpm +share/pixmaps/goffice/%%VERSION%%/minmax.xpm +share/pixmaps/goffice/%%VERSION%%/pie.xpm +share/pixmaps/goffice/%%VERSION%%/polar.png +share/pixmaps/goffice/%%VERSION%%/radar.xpm +share/pixmaps/goffice/%%VERSION%%/scatter.xpm +share/pixmaps/goffice/%%VERSION%%/stock.xpm +share/pixmaps/goffice/%%VERSION%%/surface.xpm +@dirrm share/pixmaps/goffice/%%VERSION%% +@dirrm share/pixmaps/goffice +@dirrm %%DATADIR%%/%%VERSION%%/patterns +@dirrm %%DATADIR%%/%%VERSION%%/glade +@dirrm %%DATADIR%%/%%VERSION%% +@dirrm %%DATADIR%% +@dirrm share/doc/goffice-0.6 +@dirrm lib/goffice/%%VERSION%%/plugins/smoothing +@dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit +@dirrm lib/goffice/%%VERSION%%/plugins/reg_linear +@dirrm lib/goffice/%%VERSION%%/plugins/plot_xy +@dirrm lib/goffice/%%VERSION%%/plugins/plot_surface +@dirrm lib/goffice/%%VERSION%%/plugins/plot_radar +@dirrm lib/goffice/%%VERSION%%/plugins/plot_pie +@dirrm lib/goffice/%%VERSION%%/plugins/plot_boxes +@dirrm lib/goffice/%%VERSION%%/plugins/plot_barcol +@dirrm lib/goffice/%%VERSION%%/plugins +@dirrm lib/goffice/%%VERSION%% +@dirrmtry lib/goffice +@dirrm include/libgoffice-0.6/goffice/utils +@dirrm include/libgoffice-0.6/goffice/ms-compat +@dirrm include/libgoffice-0.6/goffice/math +@dirrm include/libgoffice-0.6/goffice/gtk +@dirrm include/libgoffice-0.6/goffice/graph +@dirrm include/libgoffice-0.6/goffice/drawing +@dirrm include/libgoffice-0.6/goffice/data +@dirrm include/libgoffice-0.6/goffice/cut-n-paste/foocanvas +@dirrm include/libgoffice-0.6/goffice/cut-n-paste +@dirrm include/libgoffice-0.6/goffice/component +@dirrm include/libgoffice-0.6/goffice/app +@dirrm include/libgoffice-0.6/goffice +@dirrm include/libgoffice-0.6 +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index 804e06b93549..77a20974ca62 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -3,13 +3,14 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gvfs/Makefile,v 1.21 2008/03/18 16:16:48 mezz Exp $ +# $MCom: ports/devel/gvfs/Makefile,v 1.37 2009/01/10 01:59:21 mezz Exp $ # PORTNAME= gvfs -PORTVERSION= 0.2.5 +PORTVERSION= 1.0.3 CATEGORIES= devel gnome MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME virtual file system diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo index f9834de5f3b7..a0397c2d0987 100644 --- a/devel/gvfs/distinfo +++ b/devel/gvfs/distinfo @@ -1,3 +1,3 @@ -MD5 (gvfs-0.2.5.tar.bz2) = 01676053d9481022ade9a5274576541b -SHA256 (gvfs-0.2.5.tar.bz2) = f8bb3d32b1fe797190b9d8f2a6b0cdf91e897326a26cf8d9583e41f0d3aae86b -SIZE (gvfs-0.2.5.tar.bz2) = 826404 +MD5 (gnome2/gvfs-1.0.3.tar.bz2) = a41e8b7d99e390cef8312f7ce5f312a5 +SHA256 (gnome2/gvfs-1.0.3.tar.bz2) = 17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd +SIZE (gnome2/gvfs-1.0.3.tar.bz2) = 920742 diff --git a/devel/gvfs/files/patch-Makefile.in b/devel/gvfs/files/patch-Makefile.in index 7832811c4608..658cccd6ad11 100644 --- a/devel/gvfs/files/patch-Makefile.in +++ b/devel/gvfs/files/patch-Makefile.in @@ -1,11 +1,10 @@ ---- Makefile.in.orig 2008-02-11 20:04:47.000000000 -0500 -+++ Makefile.in 2008-02-11 20:05:02.000000000 -0500 -@@ -60,7 +60,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re - distclean-recursive maintainer-clean-recursive - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = common client daemon gconf po programs test hal -+DIST_SUBDIRS = common client daemon gconf po programs hal - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) +--- Makefile.in.orig 2008-07-22 23:17:58.000000000 -0400 ++++ Makefile.in 2008-07-22 23:18:24.000000000 -0400 +@@ -269,7 +269,6 @@ SUBDIRS = \ + gconf \ + po \ + programs \ +- test \ + $(NULL) + + EXTRA_DIST = \ diff --git a/devel/gvfs/files/patch-hal_ghalvolume.c b/devel/gvfs/files/patch-hal_ghalvolume.c deleted file mode 100644 index 519718969441..000000000000 --- a/devel/gvfs/files/patch-hal_ghalvolume.c +++ /dev/null @@ -1,14 +0,0 @@ ---- hal/ghalvolume.c.orig 2008-02-25 16:51:39.000000000 -0500 -+++ hal/ghalvolume.c 2008-02-25 16:52:00.000000000 -0500 -@@ -550,7 +550,11 @@ g_hal_volume_new (GVolumeMonitor *volu - return NULL; - - /* TODO: other OS'es? Will address this with DK aka HAL 2.0 */ -+#ifdef __FreeBSD__ -+ device_path = hal_device_get_property_string (drive_device, "freebsd.device_file"); -+#else - device_path = hal_device_get_property_string (drive_device, "linux.device_file"); -+#endif - if (strlen (device_path) == 0) - device_path = NULL; - diff --git a/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c b/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c new file mode 100644 index 000000000000..6686b28aebb7 --- /dev/null +++ b/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c @@ -0,0 +1,14 @@ +--- monitor/gphoto2/ggphoto2volume.c.orig 2008-07-22 09:29:19.000000000 -0400 ++++ monitor/gphoto2/ggphoto2volume.c 2008-07-22 23:22:30.000000000 -0400 +@@ -277,7 +277,11 @@ g_gphoto2_volume_new (GVolumeMonitor * + return NULL; + + /* TODO: other OS'es? Will address this with DK aka HAL 2.0 */ ++#ifdef __FreeBSD__ ++ device_path = hal_device_get_property_string (drive_device, "freebsd.device_file"); ++#else + device_path = hal_device_get_property_string (drive_device, "linux.device_file"); ++#endif + if (strlen (device_path) == 0) + device_path = NULL; + diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist index a9b1733da210..8670f6588266 100644 --- a/devel/gvfs/pkg-plist +++ b/devel/gvfs/pkg-plist @@ -19,14 +19,16 @@ include/gvfs-client/gvfs/gvfsurimapper.h include/gvfs-client/gvfs/gvfsuriutils.h lib/gio/modules/libgiogconf.la lib/gio/modules/libgiogconf.so -lib/gio/modules/libgiohal-volume-monitor.la -lib/gio/modules/libgiohal-volume-monitor.so +lib/gio/modules/libgioremote-volume-monitor.la +lib/gio/modules/libgioremote-volume-monitor.so lib/gio/modules/libgvfsdbus.la lib/gio/modules/libgvfsdbus.so lib/libgvfscommon.la lib/libgvfscommon.so lib/libgvfscommon.so.0 %%FUSE%%libexec/gvfs-fuse-daemon +%%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor +libexec/gvfs-hal-volume-monitor libexec/gvfsd %%ARCHIVE%%libexec/gvfsd-archive libexec/gvfsd-burn @@ -44,6 +46,8 @@ libexec/gvfsd-sftp %%SMB%%libexec/gvfsd-smb-browse libexec/gvfsd-trash share/dbus-1/services/gvfs-daemon.service +%%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service +share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service %%ARCHIVE%%share/gvfs/mounts/archive.mount share/gvfs/mounts/burn.mount %%CDDA%%share/gvfs/mounts/cdda.mount @@ -59,6 +63,8 @@ share/gvfs/mounts/sftp.mount %%SMB%%share/gvfs/mounts/smb-browse.mount %%SMB%%share/gvfs/mounts/smb.mount share/gvfs/mounts/trash.mount +%%GPHOTO2%%share/gvfs/remote-volume-monitors/gphoto2.monitor +share/gvfs/remote-volume-monitors/hal.monitor share/locale/ar/LC_MESSAGES/gvfs.mo share/locale/be@latin/LC_MESSAGES/gvfs.mo share/locale/bg/LC_MESSAGES/gvfs.mo @@ -74,12 +80,15 @@ share/locale/et/LC_MESSAGES/gvfs.mo share/locale/eu/LC_MESSAGES/gvfs.mo share/locale/fi/LC_MESSAGES/gvfs.mo share/locale/fr/LC_MESSAGES/gvfs.mo +share/locale/ga/LC_MESSAGES/gvfs.mo share/locale/gl/LC_MESSAGES/gvfs.mo +share/locale/gu/LC_MESSAGES/gvfs.mo share/locale/he/LC_MESSAGES/gvfs.mo share/locale/hi/LC_MESSAGES/gvfs.mo share/locale/hu/LC_MESSAGES/gvfs.mo share/locale/it/LC_MESSAGES/gvfs.mo share/locale/ja/LC_MESSAGES/gvfs.mo +share/locale/kn/LC_MESSAGES/gvfs.mo share/locale/ko/LC_MESSAGES/gvfs.mo share/locale/ku/LC_MESSAGES/gvfs.mo share/locale/lt/LC_MESSAGES/gvfs.mo @@ -96,8 +105,12 @@ share/locale/pt_BR/LC_MESSAGES/gvfs.mo share/locale/ru/LC_MESSAGES/gvfs.mo share/locale/sk/LC_MESSAGES/gvfs.mo share/locale/sl/LC_MESSAGES/gvfs.mo +share/locale/sq/LC_MESSAGES/gvfs.mo +share/locale/sr/LC_MESSAGES/gvfs.mo +share/locale/sr@latin/LC_MESSAGES/gvfs.mo share/locale/sv/LC_MESSAGES/gvfs.mo share/locale/ta/LC_MESSAGES/gvfs.mo +share/locale/te/LC_MESSAGES/gvfs.mo share/locale/th/LC_MESSAGES/gvfs.mo share/locale/tr/LC_MESSAGES/gvfs.mo share/locale/uk/LC_MESSAGES/gvfs.mo @@ -105,6 +118,7 @@ share/locale/vi/LC_MESSAGES/gvfs.mo share/locale/zh_CN/LC_MESSAGES/gvfs.mo share/locale/zh_HK/LC_MESSAGES/gvfs.mo share/locale/zh_TW/LC_MESSAGES/gvfs.mo +@dirrm share/gvfs/remote-volume-monitors @dirrm share/gvfs/mounts @dirrm share/gvfs @dirrm include/gvfs-client/gvfs @@ -112,6 +126,10 @@ share/locale/zh_TW/LC_MESSAGES/gvfs.mo @dirrmtry etc/profile.d @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/ku/LC_MESSAGES diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 119739295882..e55b9bb6d1ae 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libbonobo/Makefile,v 1.71 2008/03/10 16:30:35 ahze Exp $ +# $MCom: ports/devel/libbonobo/Makefile,v 1.76 2008/09/22 15:01:51 kwm Exp $ # PORTNAME= libbonobo -PORTVERSION= 2.22.0 -PORTREVISION?= 1 +PORTVERSION= 2.24.0 +PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -21,7 +21,8 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt +LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib USE_GMAKE= yes USE_BISON= build diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 8fdd99c40ea0..5ab03dda7589 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libbonobo-2.22.0.tar.bz2) = 998a576ad26784ac87eab99e96013527 -SHA256 (gnome2/libbonobo-2.22.0.tar.bz2) = 5a6d96b9b15afa5d1702eee3a1ee3e50c3cfedb65d7c3faad64036ccfb3294b4 -SIZE (gnome2/libbonobo-2.22.0.tar.bz2) = 1445318 +MD5 (gnome2/libbonobo-2.24.0.tar.bz2) = b9dd7fcd377945b227db393ac4fa3c37 +SHA256 (gnome2/libbonobo-2.24.0.tar.bz2) = bc851f032359f2c27d8980d8b0c6ba0e40e06c0c501ed9b897c7dd1723b5ef55 +SIZE (gnome2/libbonobo-2.24.0.tar.bz2) = 1455370 diff --git a/devel/libbonobo/files/patch-activation-server_object-directory-corba.c b/devel/libbonobo/files/patch-activation-server_object-directory-corba.c deleted file mode 100644 index 3fa67848dfc8..000000000000 --- a/devel/libbonobo/files/patch-activation-server_object-directory-corba.c +++ /dev/null @@ -1,15 +0,0 @@ ---- activation-server/object-directory-corba.c.orig Mon Aug 14 14:27:54 2006 -+++ activation-server/object-directory-corba.c Thu Oct 26 09:25:50 2006 -@@ -732,8 +732,10 @@ - g_object_set_data ( - G_OBJECT (cnx), "object_count", GUINT_TO_POINTER (1)); - -- ORBit_small_listen_for_broken -- (object, G_CALLBACK (active_server_cnx_broken), NULL); -+ g_signal_connect ( -+ cnx, "broken", -+ G_CALLBACK (active_server_cnx_broken), -+ NULL); - } - } else - g_assert (!strcmp (iid, NAMING_CONTEXT_IID) || diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index 1cbf066c87d1..6242f7f60d4c 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -137,6 +137,7 @@ share/locale/ku/LC_MESSAGES/libbonobo-2.0.mo share/locale/li/LC_MESSAGES/libbonobo-2.0.mo share/locale/lt/LC_MESSAGES/libbonobo-2.0.mo share/locale/lv/LC_MESSAGES/libbonobo-2.0.mo +share/locale/mai/LC_MESSAGES/libbonobo-2.0.mo share/locale/mg/LC_MESSAGES/libbonobo-2.0.mo share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo share/locale/ml/LC_MESSAGES/libbonobo-2.0.mo @@ -160,9 +161,10 @@ share/locale/sk/LC_MESSAGES/libbonobo-2.0.mo share/locale/sl/LC_MESSAGES/libbonobo-2.0.mo share/locale/sq/LC_MESSAGES/libbonobo-2.0.mo share/locale/sr/LC_MESSAGES/libbonobo-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/libbonobo-2.0.mo +share/locale/sr@latin/LC_MESSAGES/libbonobo-2.0.mo share/locale/sv/LC_MESSAGES/libbonobo-2.0.mo share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo +share/locale/te/LC_MESSAGES/libbonobo-2.0.mo share/locale/th/LC_MESSAGES/libbonobo-2.0.mo share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo share/locale/uk/LC_MESSAGES/libbonobo-2.0.mo @@ -192,6 +194,10 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo @dirrmtry share/locale/yi @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @@ -200,6 +206,8 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile index 1bc38eda5677..9ea87736f49c 100644 --- a/devel/libglademm24/Makefile +++ b/devel/libglademm24/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/devel/libglademm24/Makefile,v 1.8 2006/08/19 19:06:16 mezz Exp $ +# $MCom: ports/devel/libglademm24/Makefile,v 1.10 2008/09/22 11:42:53 kwm Exp $ # PORTNAME= libglademm -PORTVERSION= 2.6.6 -PORTREVISION= 1 +PORTVERSION= 2.6.7 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/devel/libglademm24/distinfo b/devel/libglademm24/distinfo index a629bdb3f498..eebff7ac86f0 100644 --- a/devel/libglademm24/distinfo +++ b/devel/libglademm24/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libglademm-2.6.6.tar.bz2) = c4b2440d5e816ff4d692a246bce55dfb -SHA256 (gnome2/libglademm-2.6.6.tar.bz2) = ff3928acea466b3cda3739d3a67748cb942948da853cb114d1379933224b0e60 -SIZE (gnome2/libglademm-2.6.6.tar.bz2) = 333112 +MD5 (gnome2/libglademm-2.6.7.tar.bz2) = f9ca5b67f6c551ea98790ab5f21c19d0 +SHA256 (gnome2/libglademm-2.6.7.tar.bz2) = 38543c15acf727434341cc08c2b003d24f36abc22380937707fc2c5c687a2bc3 +SIZE (gnome2/libglademm-2.6.7.tar.bz2) = 326385 diff --git a/devel/libglademm24/pkg-plist b/devel/libglademm24/pkg-plist index 4be2cb82e73f..1976033ee91b 100644 --- a/devel/libglademm24/pkg-plist +++ b/devel/libglademm24/pkg-plist @@ -15,17 +15,17 @@ libdata/pkgconfig/libglademm-%%API_VERSION%%.pc %%PORTDOCS%%share/devhelp/books/libglademm-%%API_VERSION%%/libglademm-%%API_VERSION%%.devhelp %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/annotated.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Exception.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Exception__inherit__graph.png +%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Exception__inherit__graph.dot %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Object.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Object__inherit__graph.png +%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Object__inherit__graph.dot %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1VariablesMap-members.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1VariablesMap.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1Xml-members.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1Xml.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1XmlError-members.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1XmlError.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1XmlError__inherit__graph.png -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1Xml__inherit__graph.png +%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1XmlError__inherit__graph.dot +%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1Xml__inherit__graph.dot %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classes.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/doxygen.css %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/doxygen.png @@ -36,12 +36,9 @@ libdata/pkgconfig/libglademm-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/functions_vars.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/graph_legend.dot %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/graph_legend.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/graph_legend.png %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/hierarchy.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/index.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/inherit__graph__0.png -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/inherit__graph__1.png -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/inherit__graph__2.png +%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/inherit__graph__0.dot %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/inherits.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/init_8h.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/namespaceGlib.html diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile index 8e0763309d9b..c56bb636574e 100644 --- a/devel/libgsf-gnome/Makefile +++ b/devel/libgsf-gnome/Makefile @@ -3,10 +3,10 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.10 2006/03/05 21:26:56 marcus Exp $ +# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.12 2008/09/09 00:08:35 kwm Exp $ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= devel gnome PKGNAMESUFFIX= -gnome @@ -21,7 +21,7 @@ PLIST= ${.CURDIR}/pkg-plist USE_GNOME= gnomehack libgsf gnomevfs2 libbonobo ltverhack intlhack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \ - --with-bz2 --with-gnome --without-gvfs + --with-bz2 --with-gnome-vfs --with-gio CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lgsf-1" diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index e1960df0f07a..147844c249a6 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -3,15 +3,14 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgsf/Makefile,v 1.27 2006/10/04 00:03:42 ahze Exp $ +# $MCom: ports/devel/libgsf/Makefile,v 1.33 2009/01/08 01:28:46 marcus Exp $ # PORTNAME= libgsf -PORTVERSION= 1.14.8 -PORTREVISION?= 2 +PORTVERSION= 1.14.11 +PORTREVISION?= 0 CATEGORIES?= devel MASTER_SITES= GNOME -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -27,13 +26,14 @@ USE_GETTEXT= yes USE_LDCONFIG= yes USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 gconf2 ltverhack intlhack USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS?=--without-gnome --without-python --without-gvfs +CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \ + --without-bonobo CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" .if !defined(GSF_SLAVE) GCONF_SCHEMAS= gsf-office-thumbnailer.schemas -MAN1= gsf.1 gsf-office-thumbnailer.1 +MAN1= gsf.1 gsf-office-thumbnailer.1 gsf-vba-dump.1 .endif .include <bsd.port.mk> diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index 3b84d9be47b2..d56c8857da8e 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgsf-1.14.8.tar.bz2) = 09e4b6639be79fa888cabc751f73674f -SHA256 (gnome2/libgsf-1.14.8.tar.bz2) = d5f635ea86f8417dd777c32bcf7ef86cf3af3912f34ae21db9933a0e48e54748 -SIZE (gnome2/libgsf-1.14.8.tar.bz2) = 632363 +MD5 (gnome2/libgsf-1.14.11.tar.bz2) = 86bec0012435fbafe02a6e4c88bdf9ba +SHA256 (gnome2/libgsf-1.14.11.tar.bz2) = ceb5fc6538d5998d83adf3fdf04f1dd344a5d0803c87593fadcd02db7ceabfcf +SIZE (gnome2/libgsf-1.14.11.tar.bz2) = 637329 diff --git a/devel/libgsf/files/patch-gsf-gnome-Makefile.in b/devel/libgsf/files/patch-gsf-gnome-Makefile.in index c182f45cccf8..4ef836e0b522 100644 --- a/devel/libgsf/files/patch-gsf-gnome-Makefile.in +++ b/devel/libgsf/files/patch-gsf-gnome-Makefile.in @@ -1,6 +1,6 @@ ---- gsf-gnome/Makefile.in.orig Tue Jun 19 00:39:37 2007 -+++ gsf-gnome/Makefile.in Tue Jun 19 00:41:22 2007 -@@ -66,9 +66,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" +--- gsf-gnome/Makefile.in.orig 2008-10-19 22:08:05.000000000 -0500 ++++ gsf-gnome/Makefile.in 2008-10-19 22:12:54.000000000 -0500 +@@ -66,9 +66,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -11,17 +11,16 @@ am__libgsf_gnome_1_la_SOURCES_DIST = gsf-input-gnomevfs.c \ gsf-output-gnomevfs.c gsf-input-bonobo.c gsf-output-bonobo.c \ gsf-shared-bonobo-stream.c -@@ -309,19 +307,21 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +@@ -298,18 +296,20 @@ + top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_GNOME_CFLAGS) @WITH_LIBGSF_GNOME_TRUE@lib_LTLIBRARIES = libgsf-gnome-1.la -@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS) +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(LIBGSF_GNOME_LIBS) @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LDFLAGS = -version-info \ @WITH_LIBGSF_GNOME_TRUE@ $(VERSION_INFO) $(am__append_1) - @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = \ - @WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.c \ - @WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.c $(am__append_2) + @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = $(am__append_2) \ + @WITH_LIBGSF_GNOME_TRUE@ $(am__append_3) -libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome -libgsf_gnome_1_include_HEADERS = \ - gsf-input-gnomevfs.h \ @@ -33,11 +32,11 @@ +@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_include_HEADERS = +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_include_HEADERS = \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-bonobo.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h ++@WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-input-bonobo.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h all: all-am diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index a5ba6d370bef..99a0e886b406 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -1,8 +1,6 @@ bin/gsf bin/gsf-office-thumbnailer bin/gsf-vba-dump -include/libgsf-1/gsf-gvfs/gsf-input-gvfs.h -include/libgsf-1/gsf-gvfs/gsf-output-gvfs.h include/libgsf-1/gsf/gsf-blob.h include/libgsf-1/gsf/gsf-clip-data.h include/libgsf-1/gsf/gsf-doc-meta-data.h @@ -12,9 +10,11 @@ include/libgsf-1/gsf/gsf-infile-impl.h include/libgsf-1/gsf/gsf-infile-msole.h include/libgsf-1/gsf/gsf-infile-msvba.h include/libgsf-1/gsf/gsf-infile-stdio.h +include/libgsf-1/gsf/gsf-infile-tar.h include/libgsf-1/gsf/gsf-infile-zip.h include/libgsf-1/gsf/gsf-infile.h include/libgsf-1/gsf/gsf-input-bzip.h +include/libgsf-1/gsf/gsf-input-gio.h include/libgsf-1/gsf/gsf-input-gzip.h include/libgsf-1/gsf/gsf-input-http.h include/libgsf-1/gsf/gsf-input-impl.h @@ -36,6 +36,7 @@ include/libgsf-1/gsf/gsf-outfile-zip.h include/libgsf-1/gsf/gsf-outfile.h include/libgsf-1/gsf/gsf-output-bzip.h include/libgsf-1/gsf/gsf-output-csv.h +include/libgsf-1/gsf/gsf-output-gio.h include/libgsf-1/gsf/gsf-output-gzip.h include/libgsf-1/gsf/gsf-output-iconv.h include/libgsf-1/gsf/gsf-output-impl.h @@ -43,6 +44,7 @@ include/libgsf-1/gsf/gsf-output-iochannel.h include/libgsf-1/gsf/gsf-output-memory.h include/libgsf-1/gsf/gsf-output-stdio.h include/libgsf-1/gsf/gsf-output.h +include/libgsf-1/gsf/gsf-shared-memory.h include/libgsf-1/gsf/gsf-structured-blob.h include/libgsf-1/gsf/gsf-timestamp.h include/libgsf-1/gsf/gsf-utils.h @@ -57,6 +59,7 @@ share/doc/gsf/api.html share/doc/gsf/dependencies.html share/doc/gsf/gsf-Bononbo.html share/doc/gsf/gsf-Compression.html +share/doc/gsf/gsf-GIO.html share/doc/gsf/gsf-GIOChannel.html share/doc/gsf/gsf-GnomeVFS.html share/doc/gsf/gsf-Infile-reading-structed-files.html @@ -91,15 +94,15 @@ share/doc/gsf/sources.html share/doc/gsf/style.css share/doc/gsf/up.png share/locale/es/LC_MESSAGES/libgsf.mo +share/locale/nb/LC_MESSAGES/libgsf.mo share/locale/oc/LC_MESSAGES/libgsf.mo share/locale/sv/LC_MESSAGES/libgsf.mo share/locale/zh_HK/LC_MESSAGES/libgsf.mo share/locale/zh_TW/LC_MESSAGES/libgsf.mo +@dirrm share/doc/gsf +@dirrm include/libgsf-1/gsf +@dirrm include/libgsf-1 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc -@dirrm share/doc/gsf -@dirrm include/libgsf-1/gsf-gvfs -@dirrm include/libgsf-1/gsf -@dirrm include/libgsf-1 diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 1c47ecf8168d..6c7eb0d77fa3 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgtop/Makefile,v 1.34 2008/03/10 21:59:17 mezz Exp $ +# $MCom: ports/devel/libgtop/Makefile,v 1.45 2009/01/10 01:59:21 mezz Exp $ # PORTNAME= libgtop -PORTVERSION= 2.22.3 +PORTVERSION= 2.24.0 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo index b553cb38b64b..baa6eea845a3 100644 --- a/devel/libgtop/distinfo +++ b/devel/libgtop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgtop-2.22.3.tar.bz2) = 57764ad246ceb959f601505aa2364f1f -SHA256 (gnome2/libgtop-2.22.3.tar.bz2) = d6d5a6e4c0c2f956c8b8e876cf3a5213d5364d652d7d14134cb608ad5ae0329a -SIZE (gnome2/libgtop-2.22.3.tar.bz2) = 776327 +MD5 (gnome2/libgtop-2.24.0.tar.bz2) = f0e3584b9157d3425184a9e21e3ac482 +SHA256 (gnome2/libgtop-2.24.0.tar.bz2) = af9643abf15887c9cb501a4dcc6f432ec0896b7087ef8739526f284ed1461a18 +SIZE (gnome2/libgtop-2.24.0.tar.bz2) = 775351 diff --git a/devel/libgtop/files/patch-configure b/devel/libgtop/files/patch-configure index baf610abc525..6f9d64a4b82f 100644 --- a/devel/libgtop/files/patch-configure +++ b/devel/libgtop/files/patch-configure @@ -1,10 +1,10 @@ ---- configure.orig 2008-12-06 16:04:20.000000000 -0500 -+++ configure 2008-12-06 16:04:34.000000000 -0500 +--- configure.orig 2008-12-07 00:14:33.000000000 -0500 ++++ configure 2008-12-07 00:14:54.000000000 -0500 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.61 for libgtop 2.22.3. -+# Generated by GNU Autoconf 2.62 for libgtop 2.22.3. +-# Generated by GNU Autoconf 2.61 for libgtop 2.24.0. ++# Generated by GNU Autoconf 2.62 for libgtop 2.24.0. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop>. # @@ -610,7 +610,7 @@ @@ -1691,10 +1785,10 @@ test -n "$ac_init_help" && exit $ac_stat if $ac_init_version; then cat <<\_ACEOF - libgtop configure 2.22.3 + libgtop configure 2.24.0 -generated by GNU Autoconf 2.61 +generated by GNU Autoconf 2.62 @@ -623,7 +623,7 @@ @@ -1705,7 +1799,7 @@ This file contains any messages produced running configure, to aid debugging if configure makes a mistake. - It was created by libgtop $as_me 2.22.3, which was + It was created by libgtop $as_me 2.24.0, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.62. Invocation command line was @@ -7833,16 +7833,7 @@ case "$host_os" in linux*) -@@ -21523,6 +21766,8 @@ echo $ECHO_N "checking for libgtop sysde - libgtop_sysdeps_dir=freebsd - libgtop_use_machine_h=yes - libgtop_need_server=yes -+ libgtop_sysdeps_private_mountlist=yes -+ libgtop_sysdeps_private_fsusage=yes - libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2' - ;; - solaris*) -@@ -21576,8 +21821,8 @@ echo $ECHO_N "checking for libgtop sysde +@@ -21578,8 +21821,8 @@ echo $ECHO_N "checking for libgtop sysde test -z "$libgtop_postinstall" && libgtop_postinstall=: @@ -7853,7 +7844,7 @@ -@@ -21587,10 +21832,10 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6 +@@ -21589,10 +21832,10 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6 *bsd*) case "$host_os" in *kfreebsd*) @@ -7867,7 +7858,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lkvm -lfreebsd -lbsd $LIBS" -@@ -21622,32 +21867,36 @@ case "(($ac_try" in +@@ -21624,32 +21867,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7911,7 +7902,7 @@ if test $ac_cv_lib_kvm_kvm_open = yes; then KVM_LIBS="-lkvm -lfreebsd -lbsd" else -@@ -21655,10 +21904,10 @@ else +@@ -21657,10 +21904,10 @@ else fi ;; *) @@ -7925,7 +7916,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lkvm $LIBS" -@@ -21690,32 +21939,36 @@ case "(($ac_try" in +@@ -21692,32 +21939,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7969,7 +7960,7 @@ if test $ac_cv_lib_kvm_kvm_open = yes; then KVM_LIBS=-lkvm else -@@ -21735,6 +21988,82 @@ fi +@@ -21737,6 +21988,82 @@ fi if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat" fi @@ -8052,7 +8043,7 @@ ;; esac -@@ -21743,20 +22072,21 @@ fi +@@ -21745,20 +22072,21 @@ fi for ac_header in net/if_var.h do @@ -8083,7 +8074,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21772,32 +22102,33 @@ case "(($ac_try" in +@@ -21774,32 +22102,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8124,7 +8115,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21811,51 +22142,52 @@ case "(($ac_try" in +@@ -21813,51 +22142,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8198,7 +8189,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -21864,29 +22196,31 @@ _ASBOX +@@ -21866,29 +22196,31 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -8240,7 +8231,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21929,36 +22263,37 @@ case "(($ac_try" in +@@ -21931,36 +22263,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8285,7 +8276,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22003,28 +22338,29 @@ case "(($ac_try" in +@@ -22005,28 +22338,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8320,7 +8311,7 @@ if test x$have_i4b_acct = xyes ; then cat >>confdefs.h <<\_ACEOF -@@ -22032,21 +22368,21 @@ cat >>confdefs.h <<\_ACEOF +@@ -22034,21 +22368,21 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else @@ -8347,7 +8338,7 @@ else msginfo_needs= for def in nothing KERNEL _KERNEL; do -@@ -22071,13 +22407,14 @@ case "(($ac_try" in +@@ -22073,13 +22407,14 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8364,7 +8355,7 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err -@@ -22100,7 +22437,7 @@ _ACEOF +@@ -22102,7 +22437,7 @@ _ACEOF else @@ -8373,7 +8364,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 -@@ -22112,11 +22449,11 @@ rm -f core conftest.err conftest.$ac_obj +@@ -22114,11 +22449,11 @@ rm -f core conftest.err conftest.$ac_obj fi @@ -8389,7 +8380,7 @@ { (exit 1); exit 1; }; } fi ;; -@@ -22132,20 +22469,21 @@ echo "$as_me: error: Could not find the +@@ -22134,20 +22469,21 @@ echo "$as_me: error: Could not find the for ac_header in linux/version.h do @@ -8420,7 +8411,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22161,32 +22499,33 @@ case "(($ac_try" in +@@ -22163,32 +22499,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8461,7 +8452,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22200,51 +22539,52 @@ case "(($ac_try" in +@@ -22202,51 +22539,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8535,7 +8526,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -22253,21 +22593,23 @@ _ASBOX +@@ -22255,21 +22593,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -8567,7 +8558,7 @@ _ACEOF have_linux_version_h=yes else -@@ -22286,15 +22628,15 @@ done +@@ -22288,15 +22628,15 @@ done os_version_code=`echo "$os_version_expr" | dc` fi @@ -8587,7 +8578,7 @@ ;; solaris*) os_major_version=`uname -r | sed 's/\([0-9]*\).\([0-9]*\)\.*\([0-9]*\)/\1/'` -@@ -22304,27 +22646,27 @@ echo "${ECHO_T}$os_version_code" >&6; } +@@ -22306,27 +22646,27 @@ echo "${ECHO_T}$os_version_code" >&6; } os_version_expr="$os_major_version 10000 * $os_minor_version 100 * + $os_micro_version + p q" os_version_code=`echo "$os_version_expr" | dc` @@ -8628,7 +8619,7 @@ if test x$libgtop_need_server = xyes ; then -@@ -22377,20 +22719,21 @@ fi +@@ -22379,20 +22719,21 @@ fi for ac_header in sys/bitypes.h do @@ -8659,7 +8650,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22406,32 +22749,33 @@ case "(($ac_try" in +@@ -22408,32 +22749,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8700,7 +8691,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22445,51 +22789,52 @@ case "(($ac_try" in +@@ -22447,51 +22789,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8774,7 +8765,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -22498,21 +22843,23 @@ _ASBOX +@@ -22500,21 +22843,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -8806,7 +8797,7 @@ _ACEOF fi -@@ -22529,10 +22876,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != +@@ -22531,10 +22876,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -8820,7 +8811,7 @@ else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -22547,7 +22894,7 @@ do +@@ -22549,7 +22894,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" @@ -8829,7 +8820,7 @@ break 2 fi done -@@ -22559,11 +22906,11 @@ esac +@@ -22561,11 +22906,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -8845,7 +8836,7 @@ fi -@@ -22572,10 +22919,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the +@@ -22574,10 +22919,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -8859,7 +8850,7 @@ else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -22590,7 +22937,7 @@ do +@@ -22592,7 +22937,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" @@ -8868,7 +8859,7 @@ break 2 fi done -@@ -22602,11 +22949,11 @@ esac +@@ -22604,11 +22949,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -8884,7 +8875,7 @@ fi if test "x$ac_pt_PKG_CONFIG" = x; then -@@ -22614,10 +22961,10 @@ fi +@@ -22616,10 +22961,10 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -8897,7 +8888,7 @@ whose name does not start with the host triplet. If you think this configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -22631,32 +22978,32 @@ fi +@@ -22633,32 +22978,32 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 @@ -8940,7 +8931,7 @@ (exit $ac_status); }; then pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null` else -@@ -22671,10 +23018,10 @@ if test -n "$PKG_CONFIG"; then +@@ -22673,10 +23018,10 @@ if test -n "$PKG_CONFIG"; then pkg_cv_GLIB_LIBS="$GLIB_LIBS" else if test -n "$PKG_CONFIG" && \ @@ -8953,7 +8944,7 @@ (exit $ac_status); }; then pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null` else -@@ -22702,7 +23049,7 @@ fi +@@ -22704,7 +23049,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 @@ -8962,7 +8953,7 @@ $GLIB_PKG_ERRORS -@@ -22713,7 +23060,7 @@ Alternatively, you may set the environme +@@ -22715,7 +23060,7 @@ Alternatively, you may set the environme and GLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 @@ -8971,7 +8962,7 @@ $GLIB_PKG_ERRORS -@@ -22726,7 +23073,7 @@ See the pkg-config man page for more det +@@ -22728,7 +23073,7 @@ See the pkg-config man page for more det " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then @@ -8980,7 +8971,7 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -22736,7 +23083,7 @@ See the pkg-config man page for more det +@@ -22738,7 +23083,7 @@ See the pkg-config man page for more det To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details." >&5 @@ -8989,7 +8980,7 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -22750,25 +23097,25 @@ See \`config.log' for more details." >&2 +@@ -22752,25 +23097,25 @@ See \`config.log' for more details." >&2 else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS GLIB_LIBS=$pkg_cv_GLIB_LIBS @@ -9024,7 +9015,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22784,32 +23131,33 @@ case "(($ac_try" in +@@ -22786,32 +23131,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9065,7 +9056,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22823,51 +23171,52 @@ case "(($ac_try" in +@@ -22825,51 +23171,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9139,7 +9130,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -22876,15 +23225,15 @@ _ASBOX +@@ -22878,15 +23225,15 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -9160,7 +9151,7 @@ fi if test $ac_cv_header_ifaddrs_h = yes; then -@@ -22902,10 +23251,10 @@ _ACEOF +@@ -22904,10 +23251,10 @@ _ACEOF fi @@ -9174,7 +9165,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -22977,20 +23326,21 @@ case "(($ac_try" in +@@ -22979,20 +23326,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9199,7 +9190,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_c_const=no -@@ -22998,20 +23348,20 @@ fi +@@ -23000,20 +23348,20 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -9226,7 +9217,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do -@@ -23034,20 +23384,21 @@ case "(($ac_try" in +@@ -23036,20 +23384,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9251,7 +9242,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 -@@ -23058,8 +23409,8 @@ rm -f core conftest.err conftest.$ac_obj +@@ -23060,8 +23409,8 @@ rm -f core conftest.err conftest.$ac_obj done fi @@ -9262,7 +9253,7 @@ case $ac_cv_c_inline in -@@ -23077,26 +23428,58 @@ _ACEOF +@@ -23079,26 +23428,58 @@ _ACEOF ;; esac @@ -9329,7 +9320,7 @@ ; return 0; } -@@ -23107,29 +23490,38 @@ case "(($ac_try" in +@@ -23109,29 +23490,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9375,7 +9366,7 @@ if test $ac_cv_type_off_t = yes; then : else -@@ -23140,26 +23532,58 @@ _ACEOF +@@ -23142,26 +23532,58 @@ _ACEOF fi @@ -9442,7 +9433,7 @@ ; return 0; } -@@ -23170,29 +23594,38 @@ case "(($ac_try" in +@@ -23172,29 +23594,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9488,7 +9479,7 @@ if test $ac_cv_type_pid_t = yes; then : else -@@ -23203,26 +23636,58 @@ _ACEOF +@@ -23205,26 +23636,58 @@ _ACEOF fi @@ -9555,7 +9546,7 @@ ; return 0; } -@@ -23233,29 +23698,38 @@ case "(($ac_try" in +@@ -23235,29 +23698,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9601,7 +9592,7 @@ if test $ac_cv_type_size_t = yes; then : else -@@ -23266,10 +23740,10 @@ _ACEOF +@@ -23268,10 +23740,10 @@ _ACEOF fi @@ -9615,7 +9606,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23294,20 +23768,21 @@ case "(($ac_try" in +@@ -23296,20 +23768,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9640,7 +9631,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -@@ -23333,20 +23808,21 @@ case "(($ac_try" in +@@ -23335,20 +23808,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9665,7 +9656,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_member_struct_stat_st_rdev=no -@@ -23357,8 +23833,8 @@ fi +@@ -23359,8 +23833,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -9676,7 +9667,7 @@ if test $ac_cv_member_struct_stat_st_rdev = yes; then cat >>confdefs.h <<_ACEOF -@@ -23373,10 +23849,10 @@ _ACEOF +@@ -23375,10 +23849,10 @@ _ACEOF fi @@ -9690,7 +9681,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23403,20 +23879,21 @@ case "(($ac_try" in +@@ -23405,20 +23879,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9715,7 +9706,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_time=no -@@ -23424,8 +23901,8 @@ fi +@@ -23426,8 +23901,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -9726,7 +9717,7 @@ if test $ac_cv_header_time = yes; then cat >>confdefs.h <<\_ACEOF -@@ -23434,10 +23911,10 @@ _ACEOF +@@ -23436,10 +23911,10 @@ _ACEOF fi @@ -9740,7 +9731,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23453,7 +23930,7 @@ main () +@@ -23455,7 +23930,7 @@ main () { struct tm tm; int *p = &tm.tm_sec; @@ -9749,7 +9740,7 @@ ; return 0; } -@@ -23464,20 +23941,21 @@ case "(($ac_try" in +@@ -23466,20 +23941,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9774,7 +9765,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_struct_tm=sys/time.h -@@ -23485,8 +23963,8 @@ fi +@@ -23487,8 +23963,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -9785,7 +9776,7 @@ if test $ac_cv_struct_tm = sys/time.h; then cat >>confdefs.h <<\_ACEOF -@@ -23495,10 +23973,10 @@ _ACEOF +@@ -23497,10 +23973,10 @@ _ACEOF fi @@ -9799,7 +9790,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23518,8 +23996,8 @@ fi +@@ -23520,8 +23996,8 @@ fi rm -f conftest* fi @@ -9810,7 +9801,7 @@ if test $ac_cv_type_uid_t = no; then cat >>confdefs.h <<\_ACEOF -@@ -23534,26 +24012,58 @@ _ACEOF +@@ -23536,26 +24012,58 @@ _ACEOF fi @@ -9877,7 +9868,7 @@ ; return 0; } -@@ -23564,29 +24074,38 @@ case "(($ac_try" in +@@ -23566,29 +24074,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9897,20 +9888,20 @@ } && test -s conftest.$ac_objext; then - ac_cv_type_ssize_t=yes + : -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_type_ssize_t=yes -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_ssize_t=no ++ ac_cv_type_ssize_t=yes ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ + fi @@ -9923,7 +9914,7 @@ if test $ac_cv_type_ssize_t = yes; then : else -@@ -23600,20 +24119,21 @@ fi +@@ -23602,20 +24119,21 @@ fi for ac_header in memory.h do @@ -9954,7 +9945,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23629,32 +24149,33 @@ case "(($ac_try" in +@@ -23631,32 +24149,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9995,7 +9986,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23668,51 +24189,52 @@ case "(($ac_try" in +@@ -23670,51 +24189,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10069,7 +10060,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -23721,21 +24243,23 @@ _ASBOX +@@ -23723,21 +24243,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -10101,7 +10092,7 @@ _ACEOF fi -@@ -23746,20 +24270,21 @@ done +@@ -23748,20 +24270,21 @@ done for ac_header in string.h strings.h do @@ -10132,7 +10123,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23775,32 +24300,33 @@ case "(($ac_try" in +@@ -23777,32 +24300,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10173,7 +10164,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23814,51 +24340,52 @@ case "(($ac_try" in +@@ -23816,51 +24340,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10247,7 +10238,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -23867,21 +24394,23 @@ _ASBOX +@@ -23869,21 +24394,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -10279,7 +10270,7 @@ _ACEOF break fi -@@ -23891,11 +24420,11 @@ done +@@ -23893,11 +24420,11 @@ done for ac_func in strerror do @@ -10295,7 +10286,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23948,35 +24477,41 @@ case "(($ac_try" in +@@ -23950,35 +24477,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10347,7 +10338,7 @@ _ACEOF else -@@ -23995,11 +24530,11 @@ DL_LIB= +@@ -23997,11 +24530,11 @@ DL_LIB= for ac_func in dlopen do @@ -10363,7 +10354,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -24052,43 +24587,49 @@ case "(($ac_try" in +@@ -24054,43 +24587,49 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10426,7 +10417,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -@@ -24120,40 +24661,44 @@ case "(($ac_try" in +@@ -24122,40 +24661,44 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10481,7 +10472,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -@@ -24185,32 +24730,36 @@ case "(($ac_try" in +@@ -24187,32 +24730,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10525,7 +10516,7 @@ if test $ac_cv_lib_dld_shl_load = yes; then DL_LIB="-ldld" else -@@ -24218,11 +24767,11 @@ else +@@ -24220,11 +24767,11 @@ else for ac_func in dlopen do @@ -10541,7 +10532,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -24275,35 +24824,41 @@ case "(($ac_try" in +@@ -24277,35 +24824,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10593,7 +10584,7 @@ _ACEOF DL_LIB="" else -@@ -24326,11 +24881,11 @@ LIBS="$LIBS $DL_LIB" +@@ -24328,11 +24881,11 @@ LIBS="$LIBS $DL_LIB" for ac_func in dlerror do @@ -10609,7 +10600,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -24383,35 +24938,41 @@ case "(($ac_try" in +@@ -24385,35 +24938,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10661,7 +10652,7 @@ _ACEOF fi -@@ -24421,17 +24982,17 @@ LIBS="$oLIBS" +@@ -24423,17 +24982,17 @@ LIBS="$oLIBS" if test "${ac_cv_header_linux_isdn_h+set}" = set; then @@ -10686,7 +10677,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24447,32 +25008,33 @@ case "(($ac_try" in +@@ -24449,32 +25008,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10727,7 +10718,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24486,51 +25048,52 @@ case "(($ac_try" in +@@ -24488,51 +25048,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10801,7 +10792,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -24539,15 +25102,15 @@ _ASBOX +@@ -24541,15 +25102,15 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -10822,7 +10813,7 @@ fi if test $ac_cv_header_linux_isdn_h = yes; then -@@ -24565,10 +25128,10 @@ _ACEOF +@@ -24567,10 +25128,10 @@ _ACEOF fi @@ -10836,7 +10827,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lperfstat $LIBS" -@@ -24600,32 +25163,36 @@ case "(($ac_try" in +@@ -24602,32 +25163,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10880,7 +10871,7 @@ if test $ac_cv_lib_perfstat_vmgetinfo = yes; then cat >>confdefs.h <<\_ACEOF -@@ -24638,10 +25205,10 @@ fi +@@ -24640,10 +25205,10 @@ fi case "$host_os" in solaris*) @@ -10894,7 +10885,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lkstat $LIBS" -@@ -24673,32 +25240,36 @@ case "(($ac_try" in +@@ -24675,32 +25240,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10938,7 +10929,7 @@ if test $ac_cv_lib_kstat_kstat_open = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBKSTAT 1 -@@ -24712,11 +25283,11 @@ fi +@@ -24714,11 +25283,11 @@ fi for ac_func in getloadavg swapctl do @@ -10954,7 +10945,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -24769,35 +25340,41 @@ case "(($ac_try" in +@@ -24771,35 +25340,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11006,7 +10997,7 @@ _ACEOF fi -@@ -24807,20 +25384,21 @@ done +@@ -24809,20 +25384,21 @@ done for ac_header in procfs.h sys/procfs.h do @@ -11037,7 +11028,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24836,32 +25414,33 @@ case "(($ac_try" in +@@ -24838,32 +25414,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11078,7 +11069,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24875,51 +25454,52 @@ case "(($ac_try" in +@@ -24877,51 +25454,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11152,7 +11143,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -24928,21 +25508,23 @@ _ASBOX +@@ -24930,21 +25508,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -11184,7 +11175,7 @@ _ACEOF break fi -@@ -24953,10 +25535,10 @@ done +@@ -24955,10 +25535,10 @@ done case $host_os in solaris[8-9] | solaris2.[0-9].*) @@ -11198,7 +11189,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lkvm $LIBS" -@@ -24988,41 +25570,45 @@ case "(($ac_try" in +@@ -24990,41 +25570,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11254,7 +11245,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkvm -lelf $LIBS" -@@ -25047,26 +25633,30 @@ case "(($ac_try" in +@@ -25049,26 +25633,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11290,7 +11281,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_save_LIBS" -@@ -25074,12 +25664,12 @@ rm -f core conftest.err conftest.$ac_obj +@@ -25076,12 +25664,12 @@ rm -f core conftest.err conftest.$ac_obj fi if test "$ac_cv_lib_kvm_with_elf" = "yes"; then @@ -11307,7 +11298,7 @@ fi fi -@@ -25090,10 +25680,10 @@ fi +@@ -25092,10 +25680,10 @@ fi esac @@ -11321,7 +11312,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmach $LIBS" -@@ -25125,32 +25715,36 @@ case "(($ac_try" in +@@ -25127,32 +25715,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11365,7 +11356,7 @@ if test $ac_cv_lib_mach_vm_statistics = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBMACH 1 -@@ -25163,10 +25757,10 @@ fi +@@ -25165,10 +25757,10 @@ fi saved_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -D_GNU_SOURCE" @@ -11379,7 +11370,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25209,20 +25803,21 @@ case "(($ac_try" in +@@ -25211,20 +25803,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11404,7 +11395,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "gcc_cv_decl_needed_program_invocation_name=yes" -@@ -25232,8 +25827,8 @@ rm -f core conftest.err conftest.$ac_obj +@@ -25234,8 +25827,8 @@ rm -f core conftest.err conftest.$ac_obj fi if eval "test \"`echo '$gcc_cv_decl_needed_'program_invocation_name`\" = yes"; then @@ -11415,7 +11406,7 @@ gcc_need_declarations="$gcc_need_declarations program_invocation_name" gcc_tr_decl=NEED_DECLARATION_`echo program_invocation_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -@@ -25242,17 +25837,17 @@ cat >>confdefs.h <<_ACEOF +@@ -25244,17 +25837,17 @@ cat >>confdefs.h <<_ACEOF _ACEOF else @@ -11438,7 +11429,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25305,44 +25900,48 @@ case "(($ac_try" in +@@ -25307,44 +25900,48 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11501,7 +11492,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25358,32 +25957,33 @@ case "(($ac_try" in +@@ -25360,32 +25957,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11542,7 +11533,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25397,51 +25997,52 @@ case "(($ac_try" in +@@ -25399,51 +25997,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11616,7 +11607,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -25450,30 +26051,30 @@ _ASBOX +@@ -25452,30 +26051,30 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -11659,7 +11650,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25489,32 +26090,33 @@ case "(($ac_try" in +@@ -25491,32 +26090,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11700,7 +11691,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25528,51 +26130,52 @@ case "(($ac_try" in +@@ -25530,51 +26130,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11774,7 +11765,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -25581,15 +26184,15 @@ _ASBOX +@@ -25583,15 +26184,15 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -11795,7 +11786,7 @@ fi if test $ac_cv_header_arpa_inet_h = yes; then -@@ -25599,8 +26202,8 @@ cat >>confdefs.h <<\_ACEOF +@@ -25601,8 +26202,8 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_SOCKETS 1 _ACEOF @@ -11806,7 +11797,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25626,32 +26229,36 @@ case "(($ac_try" in +@@ -25628,32 +26229,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11852,7 +11843,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -@@ -25665,10 +26272,10 @@ fi +@@ -25667,10 +26272,10 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! @@ -11866,7 +11857,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25692,31 +26299,35 @@ case "(($ac_try" in +@@ -25694,31 +26299,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11909,7 +11900,7 @@ if test $ac_cv_working_alloca_h = yes; then cat >>confdefs.h <<\_ACEOF -@@ -25725,10 +26336,10 @@ _ACEOF +@@ -25727,10 +26336,10 @@ _ACEOF fi @@ -11923,7 +11914,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25772,31 +26383,35 @@ case "(($ac_try" in +@@ -25774,31 +26383,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11966,7 +11957,7 @@ if test $ac_cv_func_alloca_works = yes; then -@@ -25817,10 +26432,10 @@ cat >>confdefs.h <<\_ACEOF +@@ -25819,10 +26432,10 @@ cat >>confdefs.h <<\_ACEOF _ACEOF @@ -11980,7 +11971,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25844,15 +26459,15 @@ fi +@@ -25846,15 +26459,15 @@ fi rm -f conftest* fi @@ -12002,7 +11993,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25905,33 +26520,39 @@ case "(($ac_try" in +@@ -25907,33 +26520,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12051,7 +12042,7 @@ cat >>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func -@@ -25943,10 +26564,10 @@ fi +@@ -25945,10 +26564,10 @@ fi done fi @@ -12065,7 +12056,7 @@ else if test "$cross_compiling" = yes; then ac_cv_c_stack_direction=0 -@@ -25984,36 +26605,39 @@ case "(($ac_try" in +@@ -25986,36 +26605,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12113,7 +12104,7 @@ cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction -@@ -26026,20 +26650,21 @@ fi +@@ -26028,20 +26650,21 @@ fi for ac_header in stdlib.h unistd.h do @@ -12144,7 +12135,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26055,32 +26680,33 @@ case "(($ac_try" in +@@ -26057,32 +26680,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12185,7 +12176,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26094,51 +26720,52 @@ case "(($ac_try" in +@@ -26096,51 +26720,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12259,7 +12250,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -26147,21 +26774,23 @@ _ASBOX +@@ -26149,21 +26774,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -12291,7 +12282,7 @@ _ACEOF fi -@@ -26171,11 +26800,11 @@ done +@@ -26173,11 +26800,11 @@ done for ac_func in getpagesize do @@ -12307,7 +12298,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26228,44 +26857,50 @@ case "(($ac_try" in +@@ -26230,44 +26857,50 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12371,7 +12362,7 @@ else if test "$cross_compiling" = yes; then ac_cv_func_mmap_fixed_mapped=no -@@ -26409,36 +27044,39 @@ case "(($ac_try" in +@@ -26411,36 +27044,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12419,7 +12410,7 @@ if test $ac_cv_func_mmap_fixed_mapped = yes; then cat >>confdefs.h <<\_ACEOF -@@ -26448,10 +27086,10 @@ _ACEOF +@@ -26450,10 +27086,10 @@ _ACEOF fi rm -f conftest.mmap @@ -12433,7 +12424,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26476,20 +27114,21 @@ case "(($ac_try" in +@@ -26478,20 +27114,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12458,7 +12449,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_signal=void -@@ -26497,8 +27136,8 @@ fi +@@ -26499,8 +27136,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -12469,7 +12460,7 @@ cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal -@@ -26508,11 +27147,11 @@ _ACEOF +@@ -26510,11 +27147,11 @@ _ACEOF for ac_func in strftime do @@ -12485,7 +12476,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26565,43 +27204,49 @@ case "(($ac_try" in +@@ -26567,43 +27204,49 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12548,7 +12539,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -26633,32 +27278,36 @@ case "(($ac_try" in +@@ -26635,32 +27278,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12592,7 +12583,7 @@ if test $ac_cv_lib_intl_strftime = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_STRFTIME 1 -@@ -26679,11 +27328,11 @@ done +@@ -26681,11 +27328,11 @@ done for ac_func in getcwd gettimeofday getwd putenv strdup strtoul uname do @@ -12608,7 +12599,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26736,35 +27385,41 @@ case "(($ac_try" in +@@ -26738,35 +27385,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12660,7 +12651,7 @@ _ACEOF fi -@@ -26774,8 +27429,8 @@ done +@@ -26776,8 +27429,8 @@ done case "$am__api_version" in 1.01234) @@ -12671,7 +12662,7 @@ { (exit 1); exit 1; }; } ;; *) -@@ -26783,27 +27438,27 @@ echo "$as_me: error: Automake 1.5 or new +@@ -26785,27 +27438,27 @@ echo "$as_me: error: Automake 1.5 or new esac if test -n "0.35.0"; then @@ -12708,7 +12699,7 @@ else case $INTLTOOL_UPDATE in [\\/]* | ?:[\\/]*) -@@ -26818,7 +27473,7 @@ do +@@ -26820,7 +27473,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" @@ -12717,7 +12708,7 @@ break 2 fi done -@@ -26830,20 +27485,20 @@ esac +@@ -26832,20 +27485,20 @@ esac fi INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE if test -n "$INTLTOOL_UPDATE"; then @@ -12745,7 +12736,7 @@ else case $INTLTOOL_MERGE in [\\/]* | ?:[\\/]*) -@@ -26858,7 +27513,7 @@ do +@@ -26860,7 +27513,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" @@ -12754,7 +12745,7 @@ break 2 fi done -@@ -26870,20 +27525,20 @@ esac +@@ -26872,20 +27525,20 @@ esac fi INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE if test -n "$INTLTOOL_MERGE"; then @@ -12782,7 +12773,7 @@ else case $INTLTOOL_EXTRACT in [\\/]* | ?:[\\/]*) -@@ -26898,7 +27553,7 @@ do +@@ -26900,7 +27553,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" @@ -12791,7 +12782,7 @@ break 2 fi done -@@ -26910,17 +27565,17 @@ esac +@@ -26912,17 +27565,17 @@ esac fi INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT if test -n "$INTLTOOL_EXTRACT"; then @@ -12815,7 +12806,7 @@ { (exit 1); exit 1; }; } fi -@@ -26967,10 +27622,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %. +@@ -26969,10 +27622,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %. # Check the gettext tools to make sure they are GNU # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 @@ -12829,7 +12820,7 @@ else case $XGETTEXT in [\\/]* | ?:[\\/]*) -@@ -26985,7 +27640,7 @@ do +@@ -26987,7 +27640,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" @@ -12838,7 +12829,7 @@ break 2 fi done -@@ -26997,20 +27652,20 @@ esac +@@ -26999,20 +27652,20 @@ esac fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then @@ -12866,7 +12857,7 @@ else case $MSGMERGE in [\\/]* | ?:[\\/]*) -@@ -27025,7 +27680,7 @@ do +@@ -27027,7 +27680,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" @@ -12875,7 +12866,7 @@ break 2 fi done -@@ -27037,20 +27692,20 @@ esac +@@ -27039,20 +27692,20 @@ esac fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then @@ -12903,7 +12894,7 @@ else case $MSGFMT in [\\/]* | ?:[\\/]*) -@@ -27065,7 +27720,7 @@ do +@@ -27067,7 +27720,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" @@ -12912,7 +12903,7 @@ break 2 fi done -@@ -27077,34 +27732,34 @@ esac +@@ -27079,34 +27732,34 @@ esac fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then @@ -12958,7 +12949,7 @@ else case $INTLTOOL_PERL in [\\/]* | ?:[\\/]*) -@@ -27119,7 +27774,7 @@ do +@@ -27121,7 +27774,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" @@ -12967,7 +12958,7 @@ break 2 fi done -@@ -27131,33 +27786,33 @@ esac +@@ -27133,33 +27786,33 @@ esac fi INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL if test -n "$INTLTOOL_PERL"; then @@ -13015,7 +13006,7 @@ { (exit 1); exit 1; }; } fi fi -@@ -27190,29 +27845,32 @@ case "(($ac_try" in +@@ -27192,29 +27845,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13056,7 +13047,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27265,44 +27923,49 @@ case "(($ac_try" in +@@ -27267,44 +27923,49 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13115,7 +13106,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -@@ -27324,20 +27987,21 @@ _ACEOF +@@ -27326,20 +27987,21 @@ _ACEOF for ac_header in locale.h do @@ -13146,7 +13137,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27353,32 +28017,33 @@ case "(($ac_try" in +@@ -27355,32 +28017,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13187,7 +13178,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27392,51 +28057,52 @@ case "(($ac_try" in +@@ -27394,51 +28057,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13261,7 +13252,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -27445,21 +28111,23 @@ _ASBOX +@@ -27447,21 +28111,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -13293,7 +13284,7 @@ _ACEOF fi -@@ -27467,10 +28135,10 @@ fi +@@ -27469,10 +28135,10 @@ fi done if test $ac_cv_header_locale_h = yes; then @@ -13307,7 +13298,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27493,31 +28161,35 @@ case "(($ac_try" in +@@ -27495,31 +28161,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13350,7 +13341,7 @@ if test $am_cv_val_LC_MESSAGES = yes; then cat >>confdefs.h <<\_ACEOF -@@ -27536,17 +28208,17 @@ _ACEOF +@@ -27538,17 +28208,17 @@ _ACEOF INTLLIBS= if test "${ac_cv_header_libintl_h+set}" = set; then @@ -13375,7 +13366,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27562,32 +28234,33 @@ case "(($ac_try" in +@@ -27564,32 +28234,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13416,7 +13407,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27601,51 +28274,52 @@ case "(($ac_try" in +@@ -27603,51 +28274,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13490,7 +13481,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -27654,15 +28328,15 @@ _ASBOX +@@ -27656,15 +28328,15 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -13511,7 +13502,7 @@ fi if test $ac_cv_header_libintl_h = yes; then -@@ -27672,10 +28346,10 @@ if test $ac_cv_header_libintl_h = yes; t +@@ -27674,10 +28346,10 @@ if test $ac_cv_header_libintl_h = yes; t # # First check in libc # @@ -13525,7 +13516,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27700,38 +28374,42 @@ case "(($ac_try" in +@@ -27702,38 +28374,42 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13578,7 +13569,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27756,43 +28434,47 @@ case "(($ac_try" in +@@ -27758,43 +28434,47 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13637,7 +13628,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27845,35 +28527,41 @@ case "(($ac_try" in +@@ -27847,35 +28527,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13689,7 +13680,7 @@ _ACEOF fi -@@ -27888,10 +28576,10 @@ done +@@ -27890,10 +28576,10 @@ done || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then @@ -13703,7 +13694,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -27923,37 +28611,41 @@ case "(($ac_try" in +@@ -27925,37 +28611,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13755,7 +13746,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -27985,37 +28677,41 @@ case "(($ac_try" in +@@ -27987,37 +28677,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13807,7 +13798,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -28047,32 +28743,36 @@ case "(($ac_try" in +@@ -28049,32 +28743,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13851,7 +13842,7 @@ if test $ac_cv_lib_intl_dgettext = yes; then gt_cv_func_dgettext_libintl=yes fi -@@ -28083,14 +28783,14 @@ fi +@@ -28085,14 +28783,14 @@ fi if test "$gt_cv_func_dgettext_libintl" != "yes" ; then @@ -13873,7 +13864,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -@@ -28122,37 +28822,41 @@ case "(($ac_try" in +@@ -28124,37 +28822,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13925,7 +13916,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -@@ -28184,32 +28888,36 @@ case "(($ac_try" in +@@ -28186,32 +28888,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13969,7 +13960,7 @@ if test $ac_cv_lib_intl_dcgettext = yes; then gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv -@@ -28235,11 +28943,11 @@ fi +@@ -28237,11 +28943,11 @@ fi for ac_func in bind_textdomain_codeset do @@ -13985,7 +13976,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -28292,35 +29000,41 @@ case "(($ac_try" in +@@ -28294,35 +29000,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14037,7 +14028,7 @@ _ACEOF fi -@@ -28356,10 +29070,10 @@ _ACEOF +@@ -28358,10 +29070,10 @@ _ACEOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 @@ -14051,7 +14042,7 @@ else case "$MSGFMT" in /*) -@@ -28383,11 +29097,11 @@ esac +@@ -28385,11 +29097,11 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then @@ -14067,7 +14058,7 @@ fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" -@@ -28395,11 +29109,11 @@ fi +@@ -28397,11 +29109,11 @@ fi for ac_func in dcgettext do @@ -14083,7 +14074,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -28452,43 +29166,49 @@ case "(($ac_try" in +@@ -28454,43 +29166,49 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14145,7 +14136,7 @@ cat >conftest.foo <<_ACEOF msgid "" -@@ -28502,25 +29222,25 @@ msgstr "" +@@ -28504,25 +29222,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" _ACEOF @@ -14180,7 +14171,7 @@ else case $GMSGFMT in [\\/]* | ?:[\\/]*) -@@ -28535,7 +29255,7 @@ do +@@ -28537,7 +29255,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" @@ -14189,7 +14180,7 @@ break 2 fi done -@@ -28548,20 +29268,20 @@ esac +@@ -28550,20 +29268,20 @@ esac fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then @@ -14217,7 +14208,7 @@ else case "$XGETTEXT" in /*) -@@ -28585,11 +29305,11 @@ esac +@@ -28587,11 +29305,11 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then @@ -14233,7 +14224,7 @@ fi cat >conftest.$ac_ext <<_ACEOF -@@ -28614,30 +29334,33 @@ case "(($ac_try" in +@@ -28616,30 +29334,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14275,7 +14266,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -28690,47 +29413,52 @@ case "(($ac_try" in +@@ -28692,47 +29413,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14337,7 +14328,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" -@@ -28756,8 +29484,8 @@ _ACEOF +@@ -28758,8 +29484,8 @@ _ACEOF if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else @@ -14348,7 +14339,7 @@ XGETTEXT=":" fi fi -@@ -28789,8 +29517,8 @@ echo "${ECHO_T}found xgettext program is +@@ -28791,8 +29517,8 @@ echo "${ECHO_T}found xgettext program is if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else @@ -14359,7 +14350,7 @@ NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no -@@ -28814,8 +29542,8 @@ echo $ECHO_N "checking for catalogs to b +@@ -28816,8 +29542,8 @@ echo $ECHO_N "checking for catalogs to b fi done LINGUAS=$NEW_LINGUAS @@ -14370,7 +14361,7 @@ fi if test -n "$LINGUAS"; then -@@ -28853,7 +29581,7 @@ test "x$prefix" = xNONE && prefix=$ac_de +@@ -28855,7 +29581,7 @@ test "x$prefix" = xNONE && prefix=$ac_de test "x$exec_prefix" = xNONE && exec_prefix=$prefix datarootdir=`eval echo "${datarootdir}"` if test "x$CATOBJEXT" = "x.mo" ; then @@ -14379,7 +14370,7 @@ else localedir=`eval echo "${datadir}/locale"` fi -@@ -28867,8 +29595,8 @@ _ACEOF +@@ -28869,8 +29595,8 @@ _ACEOF @@ -14390,7 +14381,7 @@ # Check whether --with-x was given. -@@ -28882,11 +29610,11 @@ if test "x$with_x" = xno; then +@@ -28884,11 +29610,11 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( @@ -14405,7 +14396,7 @@ else # One or both of the vars are not set, and there is no cached value. ac_x_includes=no ac_x_libraries=no -@@ -28907,7 +29635,7 @@ _ACEOF +@@ -28909,7 +29635,7 @@ _ACEOF eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. @@ -14414,7 +14405,7 @@ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break -@@ -28982,13 +29710,14 @@ case "(($ac_try" in +@@ -28984,13 +29710,14 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14431,7 +14422,7 @@ (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err -@@ -28996,7 +29725,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -28998,7 +29725,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec # We can compile using X headers with no special include directory. ac_x_includes= else @@ -14440,7 +14431,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do -@@ -29037,30 +29766,33 @@ case "(($ac_try" in +@@ -29039,30 +29766,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14481,7 +14472,7 @@ if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 -@@ -29069,6 +29801,7 @@ do +@@ -29071,6 +29801,7 @@ do done fi @@ -14489,7 +14480,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -@@ -29091,8 +29824,8 @@ fi +@@ -29093,8 +29824,8 @@ fi fi # $with_x != no if test "$have_x" != yes; then @@ -14500,7 +14491,7 @@ no_x=yes else # If each of the values was on the command line, it overrides each guess. -@@ -29102,8 +29835,8 @@ else +@@ -29104,8 +29835,8 @@ else ac_cv_have_x="have_x=yes\ ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" @@ -14511,7 +14502,7 @@ fi if test "$no_x" = yes; then -@@ -29124,8 +29857,8 @@ else +@@ -29126,8 +29857,8 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . @@ -14522,7 +14513,7 @@ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes -@@ -29150,23 +29883,26 @@ case "(($ac_try" in +@@ -29152,23 +29883,26 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14556,7 +14547,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 LIBS="$ac_xsave_LIBS -R $x_libraries" -@@ -29191,33 +29927,38 @@ case "(($ac_try" in +@@ -29193,33 +29927,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14604,7 +14595,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_c_werror_flag=$ac_xsave_c_werror_flag -@@ -29263,27 +30004,30 @@ case "(($ac_try" in +@@ -29265,27 +30004,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14643,7 +14634,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" -@@ -29315,41 +30059,45 @@ case "(($ac_try" in +@@ -29317,41 +30059,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14699,7 +14690,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -@@ -29381,32 +30129,36 @@ case "(($ac_try" in +@@ -29383,32 +30129,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14743,7 +14734,7 @@ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi -@@ -29414,6 +30166,7 @@ fi +@@ -29416,6 +30166,7 @@ fi fi fi @@ -14751,7 +14742,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" -@@ -29426,10 +30179,10 @@ rm -f core conftest.err conftest.$ac_obj +@@ -29428,10 +30179,10 @@ rm -f core conftest.err conftest.$ac_obj # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. @@ -14765,7 +14756,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29482,37 +30235,41 @@ case "(($ac_try" in +@@ -29484,37 +30235,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14817,7 +14808,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -@@ -29544,41 +30301,45 @@ case "(($ac_try" in +@@ -29546,41 +30301,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14873,7 +14864,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" -@@ -29610,32 +30371,36 @@ case "(($ac_try" in +@@ -29612,32 +30371,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14917,7 +14908,7 @@ if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi -@@ -29650,10 +30415,10 @@ fi +@@ -29652,10 +30415,10 @@ fi # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. @@ -14931,7 +14922,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29706,37 +30471,41 @@ case "(($ac_try" in +@@ -29708,37 +30471,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14983,7 +14974,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -@@ -29768,32 +30537,36 @@ case "(($ac_try" in +@@ -29770,32 +30537,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15027,7 +15018,7 @@ if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi -@@ -29801,10 +30574,10 @@ fi +@@ -29803,10 +30574,10 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. @@ -15041,7 +15032,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29857,37 +30630,41 @@ case "(($ac_try" in +@@ -29859,37 +30630,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15093,7 +15084,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" -@@ -29919,32 +30696,36 @@ case "(($ac_try" in +@@ -29921,32 +30696,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15137,7 +15128,7 @@ if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi -@@ -29952,10 +30733,10 @@ fi +@@ -29954,10 +30733,10 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. @@ -15151,7 +15142,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -30008,37 +30789,41 @@ case "(($ac_try" in +@@ -30010,37 +30789,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15203,7 +15194,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -@@ -30070,32 +30855,36 @@ case "(($ac_try" in +@@ -30072,32 +30855,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15247,7 +15238,7 @@ if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi -@@ -30112,10 +30901,10 @@ fi +@@ -30114,10 +30901,10 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry @@ -15261,7 +15252,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -@@ -30147,32 +30936,36 @@ case "(($ac_try" in +@@ -30149,32 +30936,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15305,7 +15296,7 @@ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi -@@ -30182,10 +30975,10 @@ fi +@@ -30184,10 +30975,10 @@ fi fi @@ -15319,7 +15310,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -30238,39 +31031,43 @@ case "(($ac_try" in +@@ -30240,39 +31031,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15373,7 +15364,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -@@ -30302,32 +31099,36 @@ case "(($ac_try" in +@@ -30304,32 +31099,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15417,7 +15408,7 @@ if test $ac_cv_lib_nsl_gethostbyname = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSL 1 -@@ -30339,10 +31140,10 @@ fi +@@ -30341,10 +31140,10 @@ fi fi @@ -15431,7 +15422,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -30395,39 +31196,43 @@ case "(($ac_try" in +@@ -30397,39 +31196,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15485,7 +15476,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -@@ -30459,32 +31264,36 @@ case "(($ac_try" in +@@ -30461,32 +31264,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15529,7 +15520,7 @@ if test $ac_cv_lib_socket_connect = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 -@@ -30496,10 +31305,10 @@ fi +@@ -30498,10 +31305,10 @@ fi fi @@ -15543,7 +15534,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -30552,39 +31361,43 @@ case "(($ac_try" in +@@ -30554,39 +31361,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15597,7 +15588,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -@@ -30616,32 +31429,36 @@ case "(($ac_try" in +@@ -30618,32 +31429,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15641,7 +15632,7 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBRESOLV 1 -@@ -30658,17 +31475,17 @@ fi +@@ -30660,17 +31475,17 @@ fi saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS" test -z "$with_xauth" && { if test "${ac_cv_header_X11_Xauth_h+set}" = set; then @@ -15666,7 +15657,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -30684,32 +31501,33 @@ case "(($ac_try" in +@@ -30686,32 +31501,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15707,7 +15698,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -30723,51 +31541,52 @@ case "(($ac_try" in +@@ -30725,51 +31541,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15781,7 +15772,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -30776,15 +31595,15 @@ _ASBOX +@@ -30778,15 +31595,15 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -15802,7 +15793,7 @@ fi if test $ac_cv_header_X11_Xauth_h = yes; then -@@ -30794,10 +31613,10 @@ else +@@ -30796,10 +31613,10 @@ else fi } @@ -15816,7 +15807,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXau $X_LIBS $LIBS" -@@ -30829,32 +31648,36 @@ case "(($ac_try" in +@@ -30831,32 +31648,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15860,7 +15851,7 @@ if test $ac_cv_lib_Xau_XauGetAuthByAddr = yes; then : else -@@ -30894,20 +31717,21 @@ for ac_header in fcntl.h sys/param.h sys +@@ -30896,20 +31717,21 @@ for ac_header in fcntl.h sys/param.h sys mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \ sys/filsys.h sys/fs_types.h sys/fs/s5param.h do @@ -15891,7 +15882,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -30923,32 +31747,33 @@ case "(($ac_try" in +@@ -30925,32 +31747,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15932,7 +15923,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -30962,51 +31787,52 @@ case "(($ac_try" in +@@ -30964,51 +31787,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16006,7 +15997,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -31015,21 +31841,23 @@ _ASBOX +@@ -31017,21 +31841,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -16038,7 +16029,7 @@ _ACEOF fi -@@ -31059,11 +31887,11 @@ for ac_func in bcopy endgrent endpwent f +@@ -31061,11 +31887,11 @@ for ac_func in bcopy endgrent endpwent f getcwd getmntinfo gettimeofday isascii lchown \ listmntent memcpy mkfifo strchr strerror strrchr vprintf do @@ -16054,7 +16045,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31116,35 +31944,41 @@ case "(($ac_try" in +@@ -31118,35 +31944,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16106,7 +16097,7 @@ _ACEOF fi -@@ -31177,10 +32011,10 @@ list_mounted_fs= +@@ -31179,10 +32011,10 @@ list_mounted_fs= # make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). # getmntent is in the standard C library on UNICOS, in -lsun on Irix 4, # -lseq on Dynix/PTX, -lgen on Unixware. @@ -16120,7 +16111,7 @@ else ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF -@@ -31218,26 +32052,30 @@ case "(($ac_try" in +@@ -31220,26 +32052,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16156,7 +16147,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_getmntent+set}" = set; then -@@ -31252,8 +32090,8 @@ fi +@@ -31254,8 +32090,8 @@ fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi @@ -16167,7 +16158,7 @@ ac_res=$ac_cv_search_getmntent if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -@@ -31280,10 +32118,10 @@ fi +@@ -31282,10 +32118,10 @@ fi if test -z "$list_mounted_fs"; then # Cray UNICOS 9 @@ -16181,7 +16172,7 @@ else fu_cv_sys_mounted_cray_listmntent=no cat >conftest.$ac_ext <<_ACEOF -@@ -31309,8 +32147,8 @@ rm -f conftest* +@@ -31311,8 +32147,8 @@ rm -f conftest* fi @@ -16192,7 +16183,7 @@ if test $fu_cv_sys_mounted_cray_listmntent = yes; then list_mounted_fs=found -@@ -31328,18 +32166,18 @@ if test $ac_cv_func_getmntent = yes; the +@@ -31330,18 +32166,18 @@ if test $ac_cv_func_getmntent = yes; the if test -z "$list_mounted_fs"; then # 4.3BSD, SunOS, HP-UX, Dynix, Irix @@ -16216,7 +16207,7 @@ if test $fu_cv_sys_mounted_getmntent1 = yes; then list_mounted_fs=found -@@ -31352,10 +32190,10 @@ fi +@@ -31354,10 +32190,10 @@ fi if test -z "$list_mounted_fs"; then # SVR4 @@ -16230,7 +16221,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31376,8 +32214,8 @@ rm -f conftest* +@@ -31378,8 +32214,8 @@ rm -f conftest* fi @@ -16241,7 +16232,7 @@ if test $fu_cv_sys_mounted_getmntent2 = yes; then list_mounted_fs=found -@@ -31389,8 +32227,8 @@ fi +@@ -31391,8 +32227,8 @@ fi fi if test -z "$list_mounted_fs"; then @@ -16252,7 +16243,7 @@ { (exit 1); exit 1; }; } fi -@@ -31398,10 +32236,10 @@ fi +@@ -31400,10 +32236,10 @@ fi if test -z "$list_mounted_fs"; then # DEC Alpha running OSF/1. @@ -16266,7 +16257,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31428,32 +32266,36 @@ case "(($ac_try" in +@@ -31430,32 +32266,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16310,7 +16301,7 @@ if test $fu_cv_sys_mounted_getsstat = yes; then list_mounted_fs=found -@@ -31466,10 +32308,10 @@ fi +@@ -31468,10 +32308,10 @@ fi if test -z "$list_mounted_fs"; then # AIX. @@ -16324,7 +16315,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31484,20 +32326,21 @@ case "(($ac_try" in +@@ -31486,20 +32326,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16349,7 +16340,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fu_cv_sys_mounted_vmount=no -@@ -31506,8 +32349,8 @@ fi +@@ -31508,8 +32349,8 @@ fi rm -f conftest.err conftest.$ac_ext fi @@ -16360,7 +16351,7 @@ if test $fu_cv_sys_mounted_vmount = yes; then list_mounted_fs=found -@@ -31520,10 +32363,10 @@ fi +@@ -31522,10 +32363,10 @@ fi if test -z "$list_mounted_fs"; then # SVR3 @@ -16374,7 +16365,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31541,20 +32384,21 @@ case "(($ac_try" in +@@ -31543,20 +32384,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16399,7 +16390,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fu_cv_sys_mounted_fread_fstyp=no -@@ -31563,8 +32407,8 @@ fi +@@ -31565,8 +32407,8 @@ fi rm -f conftest.err conftest.$ac_ext fi @@ -16410,7 +16401,7 @@ if test $fu_cv_sys_mounted_fread_fstyp = yes; then list_mounted_fs=found -@@ -31577,10 +32421,10 @@ fi +@@ -31579,10 +32421,10 @@ fi if test -z "$list_mounted_fs"; then # 4.4BSD and DEC OSF/1. @@ -16424,7 +16415,7 @@ else ok= -@@ -31607,8 +32451,8 @@ test -n "$ok" \ +@@ -31609,8 +32451,8 @@ test -n "$ok" \ fi @@ -16435,7 +16426,7 @@ if test $fu_cv_sys_mounted_getmntinfo = yes; then list_mounted_fs=found -@@ -31623,10 +32467,10 @@ fi +@@ -31625,10 +32467,10 @@ fi if test -z "$list_mounted_fs"; then # Ultrix @@ -16449,7 +16440,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31643,20 +32487,21 @@ case "(($ac_try" in +@@ -31645,20 +32487,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16474,7 +16465,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fu_cv_sys_mounted_getmnt=no -@@ -31665,8 +32510,8 @@ fi +@@ -31667,8 +32510,8 @@ fi rm -f conftest.err conftest.$ac_ext fi @@ -16485,7 +16476,7 @@ if test $fu_cv_sys_mounted_getmnt = yes; then list_mounted_fs=found -@@ -31679,10 +32524,10 @@ fi +@@ -31681,10 +32524,10 @@ fi if test -z "$list_mounted_fs"; then # SVR2 @@ -16499,7 +16490,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31697,20 +32542,21 @@ case "(($ac_try" in +@@ -31699,20 +32542,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16524,7 +16515,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fu_cv_sys_mounted_fread=no -@@ -31719,8 +32565,8 @@ fi +@@ -31721,8 +32565,8 @@ fi rm -f conftest.err conftest.$ac_ext fi @@ -16535,7 +16526,7 @@ if test $fu_cv_sys_mounted_fread = yes; then list_mounted_fs=found -@@ -31732,15 +32578,15 @@ fi +@@ -31734,15 +32578,15 @@ fi fi if test -z "$list_mounted_fs"; then @@ -16555,7 +16546,7 @@ space=no # Perform only the link test since it seems there are no variants of the -@@ -31751,10 +32597,10 @@ space=no +@@ -31753,10 +32597,10 @@ space=no # is what it gets when this test fails. if test $space = no; then # SVR4 @@ -16569,7 +16560,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31778,31 +32624,35 @@ case "(($ac_try" in +@@ -31780,31 +32624,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16612,7 +16603,7 @@ if test $fu_cv_sys_stat_statvfs = yes; then space=yes -@@ -31815,10 +32665,10 @@ fi +@@ -31817,10 +32665,10 @@ fi if test $space = no; then # DEC Alpha running OSF/1 @@ -16626,7 +16617,7 @@ else if test "$cross_compiling" = yes; then fu_cv_sys_stat_statfs3_osf1=no -@@ -31846,37 +32696,40 @@ case "(($ac_try" in +@@ -31848,37 +32696,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16675,7 +16666,7 @@ if test $fu_cv_sys_stat_statfs3_osf1 = yes; then space=yes -@@ -31889,10 +32742,10 @@ fi +@@ -31891,10 +32742,10 @@ fi if test $space = no; then # AIX @@ -16689,7 +16680,7 @@ else if test "$cross_compiling" = yes; then fu_cv_sys_stat_statfs2_bsize=no -@@ -31926,37 +32779,40 @@ case "(($ac_try" in +@@ -31928,37 +32779,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16738,7 +16729,7 @@ if test $fu_cv_sys_stat_statfs2_bsize = yes; then space=yes -@@ -31969,10 +32825,10 @@ fi +@@ -31971,10 +32825,10 @@ fi if test $space = no; then # SVR3 @@ -16752,7 +16743,7 @@ else if test "$cross_compiling" = yes; then fu_cv_sys_stat_statfs4=no -@@ -31997,37 +32853,40 @@ case "(($ac_try" in +@@ -31999,37 +32853,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16801,7 +16792,7 @@ if test $fu_cv_sys_stat_statfs4 = yes; then space=yes -@@ -32040,10 +32899,10 @@ fi +@@ -32042,10 +32899,10 @@ fi if test $space = no; then # 4.4BSD and NetBSD @@ -16815,7 +16806,7 @@ else if test "$cross_compiling" = yes; then fu_cv_sys_stat_statfs2_fsize=no -@@ -32074,37 +32933,40 @@ case "(($ac_try" in +@@ -32076,37 +32933,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16864,7 +16855,7 @@ if test $fu_cv_sys_stat_statfs2_fsize = yes; then space=yes -@@ -32117,10 +32979,10 @@ fi +@@ -32119,10 +32979,10 @@ fi if test $space = no; then # Ultrix @@ -16878,7 +16869,7 @@ else if test "$cross_compiling" = yes; then fu_cv_sys_stat_fs_data=no -@@ -32155,37 +33017,40 @@ case "(($ac_try" in +@@ -32157,37 +33017,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16927,7 +16918,7 @@ if test $fu_cv_sys_stat_fs_data = yes; then space=yes -@@ -32211,13 +33076,14 @@ case "(($ac_try" in +@@ -32213,13 +33076,14 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16944,7 +16935,7 @@ (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err -@@ -32229,7 +33095,7 @@ _ACEOF +@@ -32231,7 +33095,7 @@ _ACEOF space=yes else @@ -16953,7 +16944,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 -@@ -32247,10 +33113,10 @@ fi +@@ -32249,10 +33113,10 @@ fi # Check for SunOS statfs brokenness wrt partitions 2GB and larger. # If <sys/vfs.h> exists and struct statfs has a member named f_spare, # enable the work-around code in fsusage.c. @@ -16967,7 +16958,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32278,20 +33144,21 @@ case "(($ac_try" in +@@ -32280,20 +33144,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16992,7 +16983,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fu_cv_sys_truncating_statfs=no -@@ -32307,11 +33174,11 @@ cat >>confdefs.h <<\_ACEOF +@@ -32309,11 +33174,11 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi @@ -17008,7 +16999,7 @@ test -d /afs && cat >>confdefs.h <<\_ACEOF #define AFS 1 -@@ -32466,32 +33333,32 @@ fi +@@ -32468,32 +33333,32 @@ fi if test x$enable_gtk_doc = xyes; then if test -n "$PKG_CONFIG" && \ @@ -17052,7 +17043,7 @@ else case $GTKDOC_CHECK in [\\/]* | ?:[\\/]*) -@@ -32506,7 +33373,7 @@ do +@@ -32508,7 +33373,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" @@ -17061,7 +17052,7 @@ break 2 fi done -@@ -32518,11 +33385,11 @@ esac +@@ -32520,11 +33385,11 @@ esac fi GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK if test -n "$GTKDOC_CHECK"; then @@ -17077,7 +17068,7 @@ fi -@@ -32582,11 +33449,12 @@ _ACEOF +@@ -32584,11 +33449,12 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -17092,7 +17083,7 @@ *) $as_unset $ac_var ;; esac ;; esac -@@ -32619,12 +33487,12 @@ echo "$as_me: WARNING: Cache variable $a +@@ -32621,12 +33487,12 @@ echo "$as_me: WARNING: Cache variable $a if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -17109,7 +17100,7 @@ fi fi rm -f confcache -@@ -32640,7 +33508,7 @@ ac_ltlibobjs= +@@ -32642,7 +33508,7 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -17118,7 +17109,7 @@ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -@@ -32652,79 +33520,79 @@ LTLIBOBJS=$ac_ltlibobjs +@@ -32654,79 +33520,79 @@ LTLIBOBJS=$ac_ltlibobjs if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then @@ -17220,7 +17211,7 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -@@ -32733,26 +33601,27 @@ fi +@@ -32735,26 +33601,27 @@ fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then @@ -17255,7 +17246,7 @@ #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -32765,7 +33634,7 @@ ac_cs_silent=false +@@ -32767,7 +33634,7 @@ ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF @@ -17264,7 +17255,7 @@ ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -@@ -32775,7 +33644,7 @@ DUALCASE=1; export DUALCASE # for MKS sh +@@ -32777,7 +33644,7 @@ DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -17273,7 +17264,7 @@ # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -@@ -32797,17 +33666,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE +@@ -32799,17 +33666,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits @@ -17328,7 +17319,7 @@ fi # Support unset when possible. -@@ -32823,8 +33720,6 @@ fi +@@ -32825,8 +33720,6 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) @@ -17337,7 +17328,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -@@ -32847,7 +33742,7 @@ if test "x$as_myself" = x; then +@@ -32849,7 +33742,7 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then @@ -17346,7 +17337,7 @@ { (exit 1); exit 1; } fi -@@ -32860,17 +33755,10 @@ PS2='> ' +@@ -32862,17 +33755,10 @@ PS2='> ' PS4='+ ' # NLS nuisances. @@ -17368,7 +17359,7 @@ # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -32892,7 +33780,7 @@ as_me=`$as_basename -- "$0" || +@@ -32894,7 +33780,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || @@ -17377,7 +17368,7 @@ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q -@@ -32943,7 +33831,7 @@ $as_unset CDPATH +@@ -32945,7 +33831,7 @@ $as_unset CDPATH s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || @@ -17386,7 +17377,7 @@ { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems -@@ -32971,7 +33859,6 @@ case `echo -n x` in +@@ -32973,7 +33859,6 @@ case `echo -n x` in *) ECHO_N='-n';; esac @@ -17394,7 +17385,7 @@ if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -32984,19 +33871,22 @@ if test -d conf$$.dir; then +@@ -32986,19 +33871,22 @@ if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir @@ -17428,7 +17419,7 @@ else as_ln_s='cp -p' fi -@@ -33021,10 +33911,10 @@ else +@@ -33023,10 +33911,10 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then @@ -17441,16 +17432,16 @@ esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi -@@ -33047,7 +33937,7 @@ exec 6>&1 +@@ -33049,7 +33937,7 @@ exec 6>&1 # values after options handling. ac_log=" - This file was extended by libgtop $as_me 2.22.3, which was + This file was extended by libgtop $as_me 2.24.0, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -33060,7 +33950,7 @@ on `(hostname || uname -n) 2>/dev/null | +@@ -33062,7 +33950,7 @@ on `(hostname || uname -n) 2>/dev/null | _ACEOF @@ -17459,7 +17450,7 @@ # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" -@@ -33068,7 +33958,7 @@ config_commands="$ac_config_commands" +@@ -33070,7 +33958,7 @@ config_commands="$ac_config_commands" _ACEOF @@ -17468,7 +17459,7 @@ ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -@@ -33081,9 +33971,9 @@ Usage: $0 [OPTIONS] [FILE]... +@@ -33083,9 +33971,9 @@ Usage: $0 [OPTIONS] [FILE]... -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -17480,14 +17471,14 @@ Configuration files: $config_files -@@ -33097,24 +33987,25 @@ $config_commands +@@ -33099,24 +33987,25 @@ $config_commands Report bugs to <bug-autoconf@gnu.org>." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ - libgtop config.status 2.22.3 + libgtop config.status 2.24.0 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.62, @@ -17513,7 +17504,7 @@ ac_need_defaults=: while test $# != 0 do -@@ -33136,30 +34027,36 @@ do +@@ -33138,30 +34027,36 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) @@ -17556,7 +17547,7 @@ Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; -@@ -33178,27 +34075,29 @@ if $ac_cs_silent; then +@@ -33180,27 +34075,29 @@ if $ac_cs_silent; then fi _ACEOF @@ -17593,7 +17584,7 @@ # # INIT-COMMANDS # -@@ -33207,7 +34106,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac +@@ -33209,7 +34106,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac _ACEOF @@ -17602,7 +17593,7 @@ # Handling of arguments. for ac_config_target in $ac_config_targets -@@ -33245,8 +34144,8 @@ do +@@ -33247,8 +34144,8 @@ do "libgtopconfig.h") CONFIG_FILES="$CONFIG_FILES libgtopconfig.h" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; @@ -17613,7 +17604,7 @@ { (exit 1); exit 1; }; };; esac done -@@ -33287,357 +34186,143 @@ $debug || +@@ -33289,357 +34186,143 @@ $debug || (umask 077 && mkdir "$tmp") } || { @@ -18079,7 +18070,7 @@ # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty -@@ -33653,19 +34338,133 @@ s/^[^=]*=[ ]*$// +@@ -33655,19 +34338,133 @@ s/^[^=]*=[ ]*$// }' fi @@ -18217,7 +18208,7 @@ { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -@@ -33694,26 +34493,38 @@ echo "$as_me: error: Invalid tag $ac_tag +@@ -33696,26 +34493,38 @@ echo "$as_me: error: Invalid tag $ac_tag [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -18264,7 +18255,7 @@ esac ;; esac -@@ -33723,7 +34534,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^ +@@ -33725,7 +34534,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || @@ -18273,7 +18264,7 @@ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -33749,7 +34560,7 @@ echo X"$ac_file" | +@@ -33751,7 +34560,7 @@ echo X"$ac_file" | as_dirs= while :; do case $as_dir in #( @@ -18282,7 +18273,7 @@ *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" -@@ -33758,7 +34569,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ +@@ -33760,7 +34569,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || @@ -18291,7 +18282,7 @@ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -33779,17 +34590,17 @@ echo X"$as_dir" | +@@ -33781,17 +34590,17 @@ echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -18313,7 +18304,7 @@ case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -33829,12 +34640,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ +@@ -33831,12 +34640,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ esac _ACEOF @@ -18329,7 +18320,7 @@ p q } -@@ -33843,13 +34655,14 @@ case `sed -n '/datarootdir/ { +@@ -33845,13 +34655,14 @@ case `sed -n '/datarootdir/ { /@infodir@/p /@localedir@/p /@mandir@/p @@ -18348,7 +18339,7 @@ ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g -@@ -33863,15 +34676,16 @@ _ACEOF +@@ -33865,15 +34676,16 @@ _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? @@ -18369,7 +18360,7 @@ s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t -@@ -33881,135 +34695,74 @@ s&@abs_builddir@&$ac_abs_builddir&;t t +@@ -33883,135 +34695,74 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack @@ -18546,7 +18537,7 @@ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -34029,8 +34782,8 @@ echo X$ac_file | +@@ -34031,8 +34782,8 @@ echo X$ac_file | s/.*/./; q'`/stamp-h$_am_stamp_count ;; @@ -18557,7 +18548,7 @@ ;; esac -@@ -34051,7 +34804,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/ +@@ -34053,7 +34804,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || @@ -18566,7 +18557,7 @@ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -34095,7 +34848,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][ +@@ -34097,7 +34848,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || @@ -18575,7 +18566,7 @@ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -34121,7 +34874,7 @@ echo X"$file" | +@@ -34123,7 +34874,7 @@ echo X"$file" | as_dirs= while :; do case $as_dir in #( @@ -18584,7 +18575,7 @@ *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" -@@ -34130,7 +34883,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ +@@ -34132,7 +34883,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || @@ -18593,7 +18584,7 @@ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -34151,8 +34904,8 @@ echo X"$as_dir" | +@@ -34153,8 +34904,8 @@ echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -18604,7 +18595,7 @@ { (exit 1); exit 1; }; }; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" -@@ -34172,8 +34925,8 @@ done +@@ -34174,8 +34925,8 @@ done "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" if test ! -f "po/Makefile"; then @@ -18615,7 +18606,7 @@ { (exit 1); exit 1; }; } fi mv "po/Makefile" "po/Makefile.tmp" -@@ -34195,6 +34948,11 @@ _ACEOF +@@ -34197,6 +34948,11 @@ _ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save @@ -18627,7 +18618,7 @@ # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. -@@ -34216,4 +34974,8 @@ if test "$no_create" != yes; then +@@ -34218,4 +34974,8 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi diff --git a/devel/libgtop/files/patch-libgtop-sysdeps.m4 b/devel/libgtop/files/patch-libgtop-sysdeps.m4 index 0b72b319b545..1805da02a85d 100644 --- a/devel/libgtop/files/patch-libgtop-sysdeps.m4 +++ b/devel/libgtop/files/patch-libgtop-sysdeps.m4 @@ -1,14 +1,5 @@ --- libgtop-sysdeps.m4.orig 2008-04-21 14:58:38.000000000 -0400 +++ libgtop-sysdeps.m4 2008-12-06 16:16:00.000000000 -0500 -@@ -79,6 +79,8 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[ - libgtop_sysdeps_dir=freebsd - libgtop_use_machine_h=yes - libgtop_need_server=yes -+ libgtop_sysdeps_private_mountlist=yes -+ libgtop_sysdeps_private_fsusage=yes - libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2' - ;; - solaris*) @@ -158,6 +160,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[ 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 new file mode 100644 index 000000000000..25ec1f7d7949 --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am @@ -0,0 +1,17 @@ +--- 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 index e8a6bd895fa5..f68c6d0d186f 100644 --- a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in +++ b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in @@ -1,28 +1,40 @@ ---- sysdeps/freebsd/Makefile.in.orig 2007-11-02 23:55:07.000000000 -0400 -+++ sysdeps/freebsd/Makefile.in 2007-11-02 23:58:08.000000000 -0400 -@@ -54,7 +54,7 @@ libgtop_sysdeps_2_0_la_LIBADD = +--- sysdeps/freebsd/Makefile.in.orig 2008-09-29 17:24:03.000000000 -0400 ++++ sysdeps/freebsd/Makefile.in 2008-09-29 17:24:44.000000000 -0400 +@@ -54,12 +54,13 @@ 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 procopenfiles.lo \ -- procwd.lo glibtop_private.lo -+ procwd.lo glibtop_private.lo mountlist.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) am__DEPENDENCIES_1 = libgtop_sysdeps_suid_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -@@ -303,7 +303,7 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid. + $(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 +@@ -306,11 +307,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 \ - procopenfiles.c procwd.c \ -- glibtop_private.c -+ glibtop_private.c mountlist.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) -@@ -374,6 +374,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsusage.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glibtop_private.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadavg.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Plo@am__quote@ +-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 \ +@@ -385,6 +386,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_fsusage.c b/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c deleted file mode 100644 index 90da05b1b71d..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c +++ /dev/null @@ -1,61 +0,0 @@ ---- sysdeps/freebsd/fsusage.c.orig 2007-06-03 16:06:05.000000000 -0400 -+++ sysdeps/freebsd/fsusage.c 2008-02-09 19:50:44.000000000 -0500 -@@ -10,6 +10,7 @@ - #include <unistd.h> - #include <sys/param.h> - #include <sys/mount.h> -+#include <sys/statvfs.h> - #if __FreeBSD_version >= 600000 || defined(__FreeBSD_kernel__) - #include <libgeom.h> - #include <sys/resource.h> -@@ -21,15 +22,13 @@ - #include <string.h> - #include <stdlib.h> - --void --_glibtop_freebsd_get_fsusage_read_write(glibtop *server, -- glibtop_fsusage *buf, -- const char *path); -+static const unsigned long _glibtop_sysdeps_fsusage = -+(1L << GLIBTOP_FSUSAGE_BLOCKS) + (1L << GLIBTOP_FSUSAGE_BFREE) -++ (1L << GLIBTOP_FSUSAGE_BAVAIL) + (1L << GLIBTOP_FSUSAGE_FILES) -++ (1L << GLIBTOP_FSUSAGE_FFREE) + (1L << GLIBTOP_FSUSAGE_BLOCK_SIZE); - --void --_glibtop_freebsd_get_fsusage_read_write(glibtop *server, -- glibtop_fsusage *buf, -- const char *path) -+static void -+_glibtop_get_fsusage_read_write (glibtop *server, glibtop_fsusage *buf, const char *path) - { - int result; - struct statfs sfs; -@@ -135,3 +134,28 @@ _glibtop_freebsd_get_fsusage_read_write( - #endif - buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE); - } -+ -+void -+glibtop_get_fsusage_s(glibtop *server, glibtop_fsusage *buf, const char *path) -+{ -+ struct statvfs fsd; -+ -+ glibtop_init_r (&server, 0, 0); -+ -+ memset (buf, 0, sizeof (glibtop_fsusage)); -+ -+ if (statvfs (path, &fsd) < 0) -+ return; -+ -+ buf->block_size = fsd.f_frsize; -+ buf->blocks = fsd.f_blocks; -+ buf->bfree = fsd.f_bfree; -+ buf->bavail = (fsd.f_bavail > fsd.f_bfree) ? 0 : fsd.f_bavail; -+ buf->files = fsd.f_files; -+ buf->ffree = fsd.f_ffree; -+ -+ buf->flags = _glibtop_sysdeps_fsusage; -+ -+ _glibtop_get_fsusage_read_write(server, buf, path); -+} -+ diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c b/devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c deleted file mode 100644 index 7c1b1774cd89..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c +++ /dev/null @@ -1,171 +0,0 @@ ---- sysdeps/freebsd/mountlist.c.orig 2008-02-15 02:11:59.000000000 -0500 -+++ sysdeps/freebsd/mountlist.c 2008-02-15 02:28:14.000000000 -0500 -@@ -0,0 +1,168 @@ -+/* mountlist.c -- return a list of mounted filesystems -+ Copyright (C) 1991, 1992 Free Software Foundation, Inc. -+ -+ This program 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, or (at your option) -+ any later version. -+ -+ This program 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 this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#include <config.h> -+ -+#include <glib.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <sys/types.h> -+#include <sys/param.h> -+#include <sys/mount.h> -+ -+#include <string.h> -+ -+#include <glibtop.h> -+#include <glibtop/mountlist.h> -+ -+/* A mount table entry. */ -+struct mount_entry -+{ -+ char *me_devname; /* Device node pathname, including "/dev/". */ -+ char *me_mountdir; /* Mount point directory pathname. */ -+ char *me_type; /* "nfs", "4.2", etc. */ -+ dev_t me_dev; /* Device number of me_mountdir. */ -+ struct mount_entry *me_next; -+}; -+ -+static struct mount_entry *read_filesystem_list (void); -+ -+/* Return a list of the currently mounted filesystems, or NULL on error. -+ Add each entry to the tail of the list so that they stay in order. -+*/ -+ -+static struct mount_entry * -+read_filesystem_list (void) -+{ -+ struct mount_entry *mount_list; -+ struct mount_entry *me; -+ struct mount_entry *mtail; -+ -+ /* Start the list off with a dummy entry. */ -+ me = g_new (struct mount_entry, 1); -+ me->me_next = NULL; -+ mount_list = mtail = me; -+ { -+ struct statfs *fsp; -+ int entries; -+ -+ entries = getmntinfo (&fsp, MNT_NOWAIT); -+ if (entries < 0) -+ return NULL; -+ while (entries-- > 0) -+ { -+ me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry)); -+ me->me_devname = g_strdup (fsp->f_mntfromname); -+ me->me_mountdir = g_strdup (fsp->f_mntonname); -+ me->me_type = g_strdup (fsp->f_fstypename); -+ me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ -+ me->me_next = NULL; -+ -+ /* Add to the linked list. */ -+ mtail->me_next = me; -+ mtail = me; -+ fsp++; -+ } -+ } -+ -+ /* Free the dummy head. */ -+ me = mount_list; -+ mount_list = mount_list->me_next; -+ g_free (me); -+ return mount_list; -+} -+ -+static gboolean ignore_mount_entry(const struct mount_entry *me) -+{ -+ /* keep sorted */ -+ static const char ignored[][17] = { -+ "autofs", -+ "devfs", -+ "fusectl", -+ "linprocfs", -+ "linsysfs", -+ "mfs", -+ "none", -+ "nfs", -+ "nullfs", -+ "nwfs", -+ "portalfs", -+ "proc", -+ "procfs", -+ "smbfs", -+ "tmpfs", -+ "unionfs", -+ "unknown" -+ }; -+ -+ typedef int (*Comparator)(const void*, const void*); -+ -+ return bsearch(me->me_type, -+ ignored, G_N_ELEMENTS(ignored), sizeof ignored[0], -+ (Comparator) strcmp) != NULL; -+} -+ -+ -+glibtop_mountentry * -+glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs) -+{ -+ struct mount_entry *entries, *cur, *next; -+ -+ GArray *mount_array = g_array_new(FALSE, FALSE, -+ sizeof(glibtop_mountentry)); -+ -+ glibtop_init_r (&server, 0, 0); -+ -+ memset (buf, 0, sizeof (glibtop_mountlist)); -+ -+ /* Read filesystem list. */ -+ -+ if((entries = read_filesystem_list ()) == NULL) -+ return NULL; -+ -+ for (cur = &entries[0]; cur != NULL; cur = next) { -+ -+ if(all_fs || !ignore_mount_entry(cur)) { -+ /* add a new glibtop_mountentry */ -+ glibtop_mountentry e; -+ -+ g_strlcpy(e.devname, cur->me_devname, sizeof e.devname); -+ g_strlcpy(e.mountdir, cur->me_mountdir, sizeof e.mountdir); -+ g_strlcpy(e.type, cur->me_type, sizeof e.type); -+ e.dev = cur->me_dev; -+ -+ g_array_append_val(mount_array, e); -+ } -+ -+ /* free current mount_entry and move to the next */ -+ next = cur->me_next; -+ g_free(cur->me_devname); -+ g_free(cur->me_mountdir); -+ g_free(cur->me_type); -+ g_free(cur); -+ } -+ -+ buf->size = sizeof (glibtop_mountentry); -+ buf->number = mount_array->len; -+ buf->total = buf->number * buf->size; -+ -+ buf->flags = (1 << GLIBTOP_MOUNTLIST_SIZE) -+ | (1 << GLIBTOP_MOUNTLIST_NUMBER) -+ | (1 << GLIBTOP_MOUNTLIST_TOTAL); -+ -+ return (glibtop_mountentry*) g_array_free(mount_array, FALSE); -+} diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c b/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c new file mode 100644 index 000000000000..acb327f98162 --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c @@ -0,0 +1,19 @@ +--- 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 new file mode 100644 index 000000000000..f7bf0e3b1488 --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_open.c @@ -0,0 +1,91 @@ +--- sysdeps/freebsd/open.c.orig 2008-05-23 18:13:23.000000000 -0400 ++++ sysdeps/freebsd/open.c 2008-09-29 17:23:22.000000000 -0400 +@@ -20,76 +20,33 @@ + */ + + #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> +- +-/* !!! 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); ++#include <glibtop/cpu.h> ++#include <glibtop/error.h> + +- for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++) +- (*init_fkt) (server); ++#include <glibtop_private.h> + +- 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 ++ int ncpus; ++ size_t len; + +- /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */ ++ 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->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 + 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 a2bdf79aee8b..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c +++ /dev/null @@ -1,36 +0,0 @@ ---- sysdeps/freebsd/procmap.c.orig 2008-04-21 14:58:26.000000000 -0400 -+++ sysdeps/freebsd/procmap.c 2008-08-02 15:06:46.000000000 -0400 -@@ -41,7 +41,17 @@ - #define _KERNEL - #include <sys/pipe.h> - #include <sys/conf.h> -+#undef _KERNEL -+#if __FreeBSD_version >= 800038 -+#define _WANT_FILE - #include <sys/file.h> -+#undef _WANT_FILE -+#else -+#define _KERNEL -+#include <sys/file.h> -+#undef _KERNEL -+#endif -+#define _KERNEL - #include <sys/mount.h> - #include <ufs/ufs/quota.h> - #include <ufs/ufs/inode.h> -@@ -103,8 +113,14 @@ _glibtop_sysdeps_freebsd_dev_inode (glib - - 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, -+ sizeof (priv)) -+#else - kvm_read (server->machine.kd, (gulong) si.si_priv, (char *) &priv, -- sizeof (priv)) != sizeof (priv)) -+ sizeof (priv)) -+#endif -+ != sizeof (priv)) - { - glibtop_warn_io_r (server, "kvm_read (si)"); - return; diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c index 9ca014c1b508..e14dd39bdbe2 100644 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c +++ b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c @@ -1,136 +1,50 @@ ---- sysdeps/freebsd/procopenfiles.c.orig 2008-12-06 20:43:44.256309000 -0500 -+++ sysdeps/freebsd/procopenfiles.c 2008-12-06 20:44:45.000000000 -0500 -@@ -28,6 +28,16 @@ - #include <glibtop/error.h> - #include <glibtop/procopenfiles.h> - #include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#include <sys/un.h> -+#include <sys/user.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#ifdef HAVE_KINFO_GETFILE +--- sysdeps/freebsd/procopenfiles.c.orig 2008-08-18 11:23:36.000000000 -0400 ++++ sysdeps/freebsd/procopenfiles.c 2008-12-07 00:17:26.000000000 -0500 +@@ -35,6 +35,9 @@ + #include <sys/user.h> + #include <netinet/in.h> + #include <arpa/inet.h> ++#ifdef HAVE_KINFO_PROC +#include <libutil.h> +#endif #include <string.h> #include <stdlib.h> -@@ -46,6 +56,63 @@ _glibtop_init_proc_open_files_s (glibtop - server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files; - } - -+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) -+static char * -+addr_to_string(struct sockaddr_storage *ss) -+{ -+ char *buffer; -+ char buffer2[INET6_ADDRSTRLEN]; -+ struct sockaddr_in6 *sin6; -+ struct sockaddr_in *sin; -+ struct sockaddr_un *sun; -+ -+ switch (ss->ss_family) { -+ case AF_LOCAL: -+ sun = (struct sockaddr_un *)ss; -+ if (strlen(sun->sun_path) == 0) -+ buffer = g_strdup("-"); -+ else -+ buffer = g_strdup(sun->sun_path); -+ break; -+ case AF_INET: -+ sin = (struct sockaddr_in *)ss; -+ buffer = g_strdup(inet_ntoa(sin->sin_addr)); -+ break; -+ case AF_INET6: -+ sin6 = (struct sockaddr_in6 *)ss; -+ if (inet_ntop(AF_INET6, &sin6->sin6_addr, buffer2, -+ sizeof(buffer2)) != NULL) -+ buffer = g_strdup(buffer2); -+ else -+ buffer = g_strdup("-"); -+ break; -+ } -+ -+ return buffer; -+} -+ -+static int -+addr_to_port(struct sockaddr_storage *ss) -+{ -+ int port; -+ struct sockaddr_in6 *sin6; -+ struct sockaddr_in *sin; -+ -+ switch (ss->ss_family) { -+ case AF_INET: -+ sin = (struct sockaddr_in *)ss; -+ port = ntohs(sin->sin_port); -+ break; -+ case AF_INET6: -+ sin6 = (struct sockaddr_in6 *)ss; -+ port = ntohs(sin6->sin6_port); -+ break; -+ } -+ -+ return port; -+} -+#else -+ - static GArray * - parse_output(const char *output) { - GArray *entries; -@@ -159,21 +226,123 @@ parse_output(const char *output) { - - return entries; - } -+#endif - - glibtop_open_files_entry * - glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid) +@@ -263,8 +266,12 @@ glibtop_get_proc_open_files_s (glibtop * { -+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) -+ struct kinfo_file *freep, *kif; + #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; + int name[4]; + size_t len; +#else + int cnt; +#endif -+ int i; -+#else + size_t i; + #else char *output; -+#endif - GArray *entries; - +@@ -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) + #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; -+ name[3] = pid; -+ -+ if (sysctl(name, 4, NULL, &len, NULL, 0) < 0) -+ return NULL; -+ -+ freep = kif = g_malloc(len); -+ if (sysctl(name, 4, kif, &len, NULL, 0) < 0) { -+ g_free(freep); -+ return NULL; -+ } + 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)); -+ + + 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}; -+ + for (i = 0; i < len / sizeof(*kif); i++, kif++) { + glibtop_open_files_entry entry = {0}; + + if (kif->kf_structsize != sizeof(*kif)) + continue; +#else @@ -140,68 +54,6 @@ + kif = &freep[i]; +#endif + -+ if (kif->kf_fd < 0) -+ continue; -+ -+ if (kif->kf_type == KF_TYPE_SOCKET) { -+ if (kif->kf_sock_domain == AF_LOCAL) { -+ struct sockaddr_un *sun; -+ -+ entry.type = GLIBTOP_FILE_TYPE_LOCALSOCKET; -+ sun = (struct sockaddr_un *)&kif->kf_sa_local; -+ -+ if (sun->sun_path[0]) { -+ char *addrstr; -+ -+ addrstr = addr_to_string(&kif->kf_sa_local); -+ g_strlcpy(entry.info.localsock.name, -+ addrstr, -+ sizeof(entry.info.localsock.name)); -+ g_free(addrstr); -+ } else { -+ char *addrstr; -+ -+ addrstr = addr_to_string(&kif->kf_sa_peer); -+ g_strlcpy(entry.info.localsock.name, -+ addrstr, -+ sizeof(entry.info.localsock.name)); -+ g_free(addrstr); -+ } -+ } else if (kif->kf_sock_domain == AF_INET || -+ kif->kf_sock_domain == AF_INET6) { -+ char *addrstr; -+ -+ entry.type = GLIBTOP_FILE_TYPE_INETSOCKET; -+ addrstr = addr_to_string(&kif->kf_sa_peer); -+ g_strlcpy(entry.info.sock.dest_host, -+ addrstr, -+ sizeof(entry.info.sock.dest_host)); -+ g_free(addrstr); -+ entry.info.sock.dest_port = addr_to_port(&kif->kf_sa_peer); -+ } -+ } else if (kif->kf_type == KF_TYPE_PIPE) { -+ entry.type = GLIBTOP_FILE_TYPE_PIPE; -+ } else if (kif->kf_type == KF_TYPE_VNODE) { -+ entry.type = GLIBTOP_FILE_TYPE_FILE; -+ g_strlcpy(entry.info.file.name, kif->kf_path, -+ sizeof(entry.info.file.name)); -+ } else -+ continue; -+ -+ entry.fd = kif->kf_fd; -+ -+ g_array_append_val(entries, entry); -+ } -+ g_free(freep); -+#else -+ - output = execute_lsof(pid); - if (output == NULL) return NULL; - - entries = parse_output(output); - - g_free(output); -+#endif + if (kif->kf_fd < 0) + continue; - buf->flags = _glibtop_sysdeps_proc_open_files; - buf->number = entries->len; diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c index 17d9f5ec1880..731fec120d39 100644 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c +++ b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c @@ -1,112 +1,58 @@ ---- sysdeps/freebsd/procwd.c.orig 2008-12-06 20:43:44.256309000 -0500 -+++ sysdeps/freebsd/procwd.c 2008-12-06 20:44:32.000000000 -0500 -@@ -24,7 +24,12 @@ - #include <glibtop_private.h> - - #include <sys/types.h> -+#include <sys/sysctl.h> +--- sysdeps/freebsd/procwd.c.orig 2008-08-18 11:23:36.000000000 -0400 ++++ sysdeps/freebsd/procwd.c 2008-12-07 00:19:44.000000000 -0500 +@@ -27,6 +27,9 @@ + #include <sys/sysctl.h> #include <sys/param.h> -+#include <sys/user.h> + #include <sys/user.h> +#ifdef HAVE_KINFO_GETFILE +#include <libutil.h> +#endif #include <string.h> static const unsigned long _glibtop_sysdeps_proc_wd = -@@ -38,6 +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 - static GPtrArray * - parse_output(const char *output, glibtop_proc_wd *buf) - { -@@ -89,12 +95,25 @@ parse_output(const char *output, glibtop - - return dirs; - } -+#endif - - char** - glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid) - { - char path[MAXPATHLEN]; -+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) -+ struct kinfo_file *freep, *kif; -+ GPtrArray *dirs; +@@ -101,10 +104,14 @@ glibtop_get_proc_wd_s(glibtop *server, g + #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) + struct kinfo_file *freep, *kif; + GPtrArray *dirs; +#ifndef HAVE_KINFO_GETFILE -+ size_t len; -+ int name[4]; -+#else + size_t len; +- int i; + int name[4]; + #else + int cnt; +#endif + int i; +#else char *output; -+#endif - - memset (buf, 0, sizeof (glibtop_proc_wd)); + #endif -@@ -102,6 +121,54 @@ glibtop_get_proc_wd_s(glibtop *server, g - if (safe_readlink(path, buf->exe, sizeof(buf->exe))) +@@ -115,6 +122,7 @@ glibtop_get_proc_wd_s(glibtop *server, g buf->flags |= (1 << GLIBTOP_PROC_WD_EXE); -+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) + #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; -+ name[3] = pid; -+ -+ if (sysctl(name, 4, NULL, &len, NULL, 0) < 0) -+ return NULL; -+ freep = kif = g_malloc(len); -+ if (sysctl(name, 4, kif, &len, NULL, 0) < 0) { -+ g_free(freep); -+ return NULL; -+ } + name[0] = CTL_KERN; + name[1] = KERN_PROC; + name[2] = KERN_PROC_FILEDESC; +@@ -127,10 +135,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); -+ + + dirs = g_ptr_array_sized_new(1); + +#ifndef HAVE_KINFO_GETFILE -+ for (i = 0; i < len / sizeof(*kif); i++, kif++) { + 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, -+ sizeof(buf->root)); -+ buf->flags |= (1 << GLIBTOP_PROC_WD_ROOT); -+ break; -+ case KF_FD_TYPE_CWD: -+ g_ptr_array_add(dirs, g_strdup (kif->kf_path)); -+ break; -+ } -+ } -+ g_free(freep); -+ -+ buf->number = dirs->len; -+ buf->flags |= (1 << GLIBTOP_PROC_WD_NUMBER); -+ -+ g_ptr_array_add(dirs, NULL); + -+ return (char **)g_ptr_array_free(dirs, FALSE); -+#else - output = execute_lsof(pid); - if (output != NULL) { - GPtrArray *dirs; -@@ -116,6 +183,7 @@ glibtop_get_proc_wd_s(glibtop *server, g - - return (char **)g_ptr_array_free(dirs, FALSE); - } -+#endif - - return NULL; - } + 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_shm_limits.c b/devel/libgtop/files/patch-sysdeps_freebsd_shm_limits.c deleted file mode 100644 index 8fa00f388d8c..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_shm_limits.c +++ /dev/null @@ -1,22 +0,0 @@ ---- sysdeps/freebsd/shm_limits.c.orig 2008-02-14 12:26:46.000000000 -0500 -+++ sysdeps/freebsd/shm_limits.c 2008-02-14 12:26:29.000000000 -0500 -@@ -25,6 +25,7 @@ - #include <glibtop/shm_limits.h> - - #include <sys/types.h> -+#include <sys/param.h> - #include <sys/sysctl.h> - - static unsigned long _glibtop_sysdeps_shm_limits = -@@ -46,7 +47,11 @@ void - glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf) - { - size_t len; -+#if __FreeBSD_version < 700002 - int shmmax, shmmin, shmmni, shmseg, shmall; -+#else -+ unsigned long shmmax, shmmin, shmmni, shmseg, shmall; -+#endif - - glibtop_init_s (&server, GLIBTOP_SYSDEPS_SHM_LIMITS, 0); - diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c b/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c new file mode 100644 index 000000000000..a188b364cbcd --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c @@ -0,0 +1,94 @@ +--- sysdeps/freebsd/suid_open.c.orig 2008-09-29 17:22:12.000000000 -0400 ++++ sysdeps/freebsd/suid_open.c 2008-09-29 17:23:35.000000000 -0400 +@@ -0,0 +1,91 @@ ++/* 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) ++{ ++#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_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_sysinfo.c b/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c new file mode 100644 index 000000000000..ab5fdd66d5ee --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c @@ -0,0 +1,13 @@ +--- 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 91e8d83abe47..fa5b9d29dda8 100644 --- a/devel/libgtop/pkg-plist +++ b/devel/libgtop/pkg-plist @@ -16,6 +16,7 @@ include/libgtop-2.0/glibtop/netload.h include/libgtop-2.0/glibtop/open.h include/libgtop-2.0/glibtop/parameter.h include/libgtop-2.0/glibtop/ppp.h +include/libgtop-2.0/glibtop/procaffinity.h include/libgtop-2.0/glibtop/procargs.h include/libgtop-2.0/glibtop/prockernel.h include/libgtop-2.0/glibtop/proclist.h @@ -158,7 +159,7 @@ share/locale/sk/LC_MESSAGES/libgtop-2.0.mo share/locale/sl/LC_MESSAGES/libgtop-2.0.mo share/locale/sq/LC_MESSAGES/libgtop-2.0.mo share/locale/sr/LC_MESSAGES/libgtop-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo +share/locale/sr@latin/LC_MESSAGES/libgtop-2.0.mo share/locale/sv/LC_MESSAGES/libgtop-2.0.mo share/locale/ta/LC_MESSAGES/libgtop-2.0.mo share/locale/te/LC_MESSAGES/libgtop-2.0.mo @@ -179,6 +180,8 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo @dirrmtry share/locale/xh @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile index b563d4ffc16a..b01eaf41b5f1 100644 --- a/devel/libnotify/Makefile +++ b/devel/libnotify/Makefile @@ -3,11 +3,11 @@ # Whom: Andreas Kohn <andreas@syndrom23.de> # # $FreeBSD$ +# $MCom: ports/devel/libnotify/Makefile,v 1.3 2008/11/30 19:42:57 marcus Exp $ # PORTNAME= libnotify -PORTVERSION= 0.4.4 -PORTREVISION= 2 +PORTVERSION= 0.4.5 CATEGORIES= devel gnome MASTER_SITES= http://www.galago-project.org/files/releases/source/libnotify/ diff --git a/devel/libnotify/distinfo b/devel/libnotify/distinfo index c499bccb0c26..fa3d33aa8905 100644 --- a/devel/libnotify/distinfo +++ b/devel/libnotify/distinfo @@ -1,3 +1,3 @@ -MD5 (libnotify-0.4.4.tar.gz) = ba76f68b7e3bd284ac2c2a1b9c5ecb06 -SHA256 (libnotify-0.4.4.tar.gz) = 2389a9b8220f776033f728a8d46352cfee5c8705066e34887bfb188f9f0d3856 -SIZE (libnotify-0.4.4.tar.gz) = 395528 +MD5 (libnotify-0.4.5.tar.gz) = 472e2c1f808848365572a9b024d9e8f5 +SHA256 (libnotify-0.4.5.tar.gz) = 0799db8ea1500b65a477421a8c930cc8c8b0bbc0596e55ea1601e2542f3fb0d9 +SIZE (libnotify-0.4.5.tar.gz) = 364142 diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 8aa6caa4ed60..53532478b4e3 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libsoup/Makefile,v 1.42 2008/03/10 21:18:42 mezz Exp $ +# $MCom: ports/devel/libsoup/Makefile,v 1.52 2008/11/25 16:22:57 marcus Exp $ # PORTNAME= libsoup -PORTVERSION= 2.4.1 -PORTREVISION?= 1 +PORTVERSION= 2.24.2.1 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index f185585d8abe..df4036166ec5 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libsoup-2.4.1.tar.bz2) = d0fc91ccb9da401e9e40d2f4612bdac9 -SHA256 (gnome2/libsoup-2.4.1.tar.bz2) = 774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd -SIZE (gnome2/libsoup-2.4.1.tar.bz2) = 627890 +MD5 (gnome2/libsoup-2.24.2.1.tar.bz2) = 27409ea1a93e45668e1b999f162ee4d0 +SHA256 (gnome2/libsoup-2.24.2.1.tar.bz2) = acc2568cd0d75b5a8c81f3a88754876ce16eddddbc9c153f7dec413182e874be +SIZE (gnome2/libsoup-2.24.2.1.tar.bz2) = 658843 diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index 915831c2d51f..f753686dcd54 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -3,6 +3,8 @@ include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-basic.h include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-digest.h include/libsoup-%%VERSION%%/libsoup/soup-auth-domain.h include/libsoup-%%VERSION%%/libsoup/soup-auth.h +include/libsoup-%%VERSION%%/libsoup/soup-cookie-jar.h +include/libsoup-%%VERSION%%/libsoup/soup-cookie.h include/libsoup-%%VERSION%%/libsoup/soup-date.h include/libsoup-%%VERSION%%/libsoup/soup-enum-types.h include/libsoup-%%VERSION%%/libsoup/soup-form.h @@ -16,6 +18,7 @@ include/libsoup-%%VERSION%%/libsoup/soup-misc.h include/libsoup-%%VERSION%%/libsoup/soup-portability.h include/libsoup-%%VERSION%%/libsoup/soup-server.h include/libsoup-%%VERSION%%/libsoup/soup-session-async.h +include/libsoup-%%VERSION%%/libsoup/soup-session-feature.h include/libsoup-%%VERSION%%/libsoup/soup-session-sync.h include/libsoup-%%VERSION%%/libsoup/soup-session.h include/libsoup-%%VERSION%%/libsoup/soup-socket.h diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile index 5f28790d4617..6c73e2c2eb78 100644 --- a/devel/py-gobject/Makefile +++ b/devel/py-gobject/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/py-gobject/Makefile,v 1.21 2007/09/16 17:11:09 ahze Exp $ +# $MCom: ports/devel/py-gobject/Makefile,v 1.29 2009/01/04 22:11:03 marcus Exp $ # PORTNAME= gobject -PORTVERSION= 2.14.2 -PORTREVISION= 2 +PORTVERSION= 2.16.0 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -24,6 +23,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack glib20 USE_PYTHON= yes GNU_CONFIGURE= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-docs CONFLICTS= py*-gtk-0* diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo index 9a08c85d6330..d7878e045ba9 100644 --- a/devel/py-gobject/distinfo +++ b/devel/py-gobject/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pygobject-2.14.2.tar.bz2) = 0e9e9300e81847f4f7266f49d3bebbaf -SHA256 (gnome2/pygobject-2.14.2.tar.bz2) = 79c5d3ab8f072f1d0b102b2bd6410b0dc383a008b5efad1750d8b6dadfde8c6e -SIZE (gnome2/pygobject-2.14.2.tar.bz2) = 366808 +MD5 (gnome2/pygobject-2.16.0.tar.bz2) = 431e7d4632163b93d1ee43cd071a389c +SHA256 (gnome2/pygobject-2.16.0.tar.bz2) = db0ab6f998bc5750aba2dfa96c8932f673914d8bf804a2c1c769b4a6e3f192d2 +SIZE (gnome2/pygobject-2.16.0.tar.bz2) = 515503 diff --git a/devel/py-gobject/files/patch-gobject_gobjectmodule.c b/devel/py-gobject/files/patch-gobject_gobjectmodule.c deleted file mode 100644 index 1cc2885a21da..000000000000 --- a/devel/py-gobject/files/patch-gobject_gobjectmodule.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gobject/gobjectmodule.c.orig 2008-06-29 19:20:31.000000000 -0400 -+++ gobject/gobjectmodule.c 2008-06-29 19:21:16.000000000 -0400 -@@ -2564,7 +2564,7 @@ pyg_markup_escape_text(PyObject *unused, - { - static char *kwlist[] = { "text", NULL }; - char *text_in, *text_out; -- int text_size; -+ Py_ssize_t text_size; - PyObject *retval; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist index de86b146d3a4..63a4cceb85d4 100644 --- a/devel/py-gobject/pkg-plist +++ b/devel/py-gobject/pkg-plist @@ -1,7 +1,27 @@ +bin/pygobject-codegen-2.0 +include/pygtk-2.0/pyglib.h include/pygtk-2.0/pygobject.h +lib/libpyglib-2.0.la +lib/libpyglib-2.0.so +lib/libpyglib-2.0.so.0 %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/_gio.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/_gio.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/_glib.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/_glib.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/option.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/option.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/option.pyo %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.py %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.pyo @@ -10,9 +30,6 @@ include/pygtk-2.0/pygobject.h %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.py %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.pyo %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.py %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.pyo @@ -21,12 +38,14 @@ include/pygtk-2.0/pygobject.h %%PYTHON_SITELIBDIR%%/pygtk.pyc %%PYTHON_SITELIBDIR%%/pygtk.pyo libdata/pkgconfig/pygobject-2.0.pc +share/doc/pygobject/class-glibmaincontext.html +share/doc/pygobject/class-glibmainloop.html share/doc/pygobject/class-gobject.html share/doc/pygobject/class-gobjectgboxed.html share/doc/pygobject/class-gobjectginterface.html share/doc/pygobject/class-gobjectgpointer.html -share/doc/pygobject/class-gobjectmaincontext.html -share/doc/pygobject/class-gobjectmainloop.html +share/doc/pygobject/glib-constants.html +share/doc/pygobject/glib-functions.html share/doc/pygobject/gobject-class-reference.html share/doc/pygobject/gobject-constants.html share/doc/pygobject/gobject-functions.html @@ -35,6 +54,65 @@ share/doc/pygobject/index.sgml share/doc/pygobject/pygobject-introduction.html share/doc/pygobject/pygobject.devhelp share/doc/pygobject/style.css +share/pygobject/2.0/codegen/__init__.py +share/pygobject/2.0/codegen/__init__.pyc +share/pygobject/2.0/codegen/__init__.pyo +share/pygobject/2.0/codegen/argtypes.py +share/pygobject/2.0/codegen/argtypes.pyc +share/pygobject/2.0/codegen/argtypes.pyo +share/pygobject/2.0/codegen/codegen.py +share/pygobject/2.0/codegen/codegen.pyc +share/pygobject/2.0/codegen/codegen.pyo +share/pygobject/2.0/codegen/createdefs.py +share/pygobject/2.0/codegen/createdefs.pyc +share/pygobject/2.0/codegen/createdefs.pyo +share/pygobject/2.0/codegen/definitions.py +share/pygobject/2.0/codegen/definitions.pyc +share/pygobject/2.0/codegen/definitions.pyo +share/pygobject/2.0/codegen/defsparser.py +share/pygobject/2.0/codegen/defsparser.pyc +share/pygobject/2.0/codegen/defsparser.pyo +share/pygobject/2.0/codegen/docextract.py +share/pygobject/2.0/codegen/docextract.pyc +share/pygobject/2.0/codegen/docextract.pyo +share/pygobject/2.0/codegen/docgen.py +share/pygobject/2.0/codegen/docgen.pyc +share/pygobject/2.0/codegen/docgen.pyo +share/pygobject/2.0/codegen/h2def.py +share/pygobject/2.0/codegen/h2def.pyc +share/pygobject/2.0/codegen/h2def.pyo +share/pygobject/2.0/codegen/mergedefs.py +share/pygobject/2.0/codegen/mergedefs.pyc +share/pygobject/2.0/codegen/mergedefs.pyo +share/pygobject/2.0/codegen/mkskel.py +share/pygobject/2.0/codegen/mkskel.pyc +share/pygobject/2.0/codegen/mkskel.pyo +share/pygobject/2.0/codegen/override.py +share/pygobject/2.0/codegen/override.pyc +share/pygobject/2.0/codegen/override.pyo +share/pygobject/2.0/codegen/reversewrapper.py +share/pygobject/2.0/codegen/reversewrapper.pyc +share/pygobject/2.0/codegen/reversewrapper.pyo +share/pygobject/2.0/codegen/scmexpr.py +share/pygobject/2.0/codegen/scmexpr.pyc +share/pygobject/2.0/codegen/scmexpr.pyo +share/pygobject/2.0/defs/gappinfo.override +share/pygobject/2.0/defs/gapplaunchcontext.override +share/pygobject/2.0/defs/gfile.override +share/pygobject/2.0/defs/gfileattribute.override +share/pygobject/2.0/defs/gfileenumerator.override +share/pygobject/2.0/defs/gfileinfo.override +share/pygobject/2.0/defs/gicon.override +share/pygobject/2.0/defs/ginputstream.override +share/pygobject/2.0/defs/gio-types.defs +share/pygobject/2.0/defs/gio.defs +share/pygobject/2.0/defs/gio.override +share/pygobject/2.0/defs/goutputstream.override +share/pygobject/2.0/defs/gvolume.override +share/pygobject/2.0/defs/gvolumemonitor.override +share/pygobject/2.0/defs/unix-types.defs +share/pygobject/2.0/defs/unix.defs +share/pygobject/2.0/defs/unix.override share/pygobject/xsl/common.xsl share/pygobject/xsl/devhelp.xsl share/pygobject/xsl/fixxref.py @@ -43,8 +121,13 @@ share/pygobject/xsl/pdf-style.xsl share/pygobject/xsl/pdf.xsl share/pygobject/xsl/ref-html-style.xsl @dirrm share/pygobject/xsl +@dirrm share/pygobject/2.0/defs +@dirrm share/pygobject/2.0/codegen +@dirrm share/pygobject/2.0 @dirrm share/pygobject @dirrm share/doc/pygobject @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject +@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/glib +@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gio @dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0 @dirrmtry include/pygtk-2.0 diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile index 146197be729a..14328870fc5e 100644 --- a/devel/py-orbit/Makefile +++ b/devel/py-orbit/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/py-orbit2/Makefile,v 1.11 2006/04/13 07:52:34 bland Exp $ +# $MCom: ports/devel/py-orbit/Makefile,v 1.1 2008/09/23 20:08:04 mezz Exp $ +# PORTNAME= orbit -PORTVERSION= 2.14.3 -PORTREVISION= 1 +PORTVERSION= 2.24.0 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/pyorbit/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/py-orbit/distinfo b/devel/py-orbit/distinfo index ba360c458b40..c2d848cee6f8 100644 --- a/devel/py-orbit/distinfo +++ b/devel/py-orbit/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pyorbit-2.14.3.tar.bz2) = 3c4d42ae1a7303fd85071a842617043f -SHA256 (gnome2/pyorbit-2.14.3.tar.bz2) = a3517e0ddaf23508f99e7489a23e3462f86c528ea24bce432e832a78ee4149db -SIZE (gnome2/pyorbit-2.14.3.tar.bz2) = 284374 +MD5 (gnome2/pyorbit-2.24.0.tar.bz2) = 574593815e75ee6e98062c75d6d1581f +SHA256 (gnome2/pyorbit-2.24.0.tar.bz2) = 8754669b8220aa1f151b920360029d5ea28c42bec55769059676725fe28397b8 +SIZE (gnome2/pyorbit-2.24.0.tar.bz2) = 293054 |