diff options
author | Koop Mast <kwm@FreeBSD.org> | 2010-11-20 15:37:08 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2010-11-20 15:37:08 +0000 |
commit | 3680f27ebff58ece429c4e032f9ad84fb1372114 (patch) | |
tree | 6c5ff4664c1a779ddad350ac887e5706dbfdd4eb /devel | |
parent | 02c6e6b485454dc3f5a27cbc887d9e4aaf376a36 (diff) | |
download | ports-3680f27ebff58ece429c4e032f9ad84fb1372114.tar.gz ports-3680f27ebff58ece429c4e032f9ad84fb1372114.zip |
Notes
Diffstat (limited to 'devel')
102 files changed, 1055 insertions, 621 deletions
diff --git a/devel/Makefile b/devel/Makefile index f6f9eb75f3fe..0d8a9c492ab5 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -479,7 +479,6 @@ SUBDIR += gindent SUBDIR += gio-fam-backend SUBDIR += gir-repository - SUBDIR += gir-repository-dbus SUBDIR += gir-repository-gconf2 SUBDIR += gir-repository-libnotify SUBDIR += gir-repository-libsoup @@ -876,6 +875,7 @@ SUBDIR += libsigsegv SUBDIR += libslang2 SUBDIR += libsoup + SUBDIR += libsoup-gnome SUBDIR += libsoup-reference SUBDIR += libsoup22 SUBDIR += libstatgrab diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index b2e074b2ef44..2fa796ead901 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -3,12 +3,12 @@ # Whom: Chia-liang Kao <clkao@CirX.ORG> # # $FreeBSD$ -# $MCom: ports/devel/ORBit2/Makefile,v 1.55 2010/04/02 17:37:25 kwm Exp $ +# $MCom: ports/devel/ORBit2/Makefile,v 1.57 2010/09/29 14:08:02 kwm Exp $ # PORTNAME= ORBit2 -PORTVERSION= 2.14.18 -PORTREVISION?= 1 +PORTVERSION= 2.14.19 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index b4e655b065bb..5d8828ecc1da 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/ORBit2-2.14.18.tar.bz2) = 3e80596171b1ea652707219c7144ff53 -SHA256 (gnome2/ORBit2-2.14.18.tar.bz2) = c6148edd8044255aeed9ab1d1eeb3c39edd0aa1ace5d33cf6831b80d11f1ab7c -SIZE (gnome2/ORBit2-2.14.18.tar.bz2) = 747701 +MD5 (gnome2/ORBit2-2.14.19.tar.bz2) = 7082d317a9573ab338302243082d10d1 +SHA256 (gnome2/ORBit2-2.14.19.tar.bz2) = 55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550 +SIZE (gnome2/ORBit2-2.14.19.tar.bz2) = 764820 diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile index 2223a250c84e..61dee88db025 100644 --- a/devel/anjuta-extras/Makefile +++ b/devel/anjuta-extras/Makefile @@ -3,20 +3,18 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/anjuta-extras/Makefile,v 1.7 2010/04/29 15:08:31 kwm Exp $ +# $MCom: ports/devel/anjuta-extras/Makefile,v 1.11 2010/09/29 12:14:23 kwm Exp $ # PORTNAME= anjuta-extras -PORTVERSION= 2.30.1.0 +PORTVERSION= 2.32.0.0 CATEGORIES= devel MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Extra anjuta plugins. -BUILD_DEPENDS= neato:${PORTSDIR}/graphics/graphviz LIB_DEPENDS= anjuta.0:${PORTSDIR}/devel/anjuta -RUN_DEPENDS= neato:${PORTSDIR}/graphics/graphviz USE_BZIP2= yes USE_LDCONFIG= yes diff --git a/devel/anjuta-extras/distinfo b/devel/anjuta-extras/distinfo index 70c891199e11..312e793d72b1 100644 --- a/devel/anjuta-extras/distinfo +++ b/devel/anjuta-extras/distinfo @@ -1,3 +1,3 @@ -MD5 (anjuta-extras-2.30.1.0.tar.bz2) = c76a0843896890e054b063551fa431eb -SHA256 (anjuta-extras-2.30.1.0.tar.bz2) = 6a8f37de883d05596d7b416a10d49d737c735a7dd0767ce4b804480255cfe808 -SIZE (anjuta-extras-2.30.1.0.tar.bz2) = 2873072 +MD5 (anjuta-extras-2.32.0.0.tar.bz2) = 44e79fb026524897d123bcde5e7861f9 +SHA256 (anjuta-extras-2.32.0.0.tar.bz2) = 220fd7cf87de2f8e3de2fcbc01373e25f66b428cf5b2c8a25aa9b4b3527ad620 +SIZE (anjuta-extras-2.32.0.0.tar.bz2) = 2701220 diff --git a/devel/anjuta-extras/pkg-plist b/devel/anjuta-extras/pkg-plist index d274e65150ba..35e342347f93 100644 --- a/devel/anjuta-extras/pkg-plist +++ b/devel/anjuta-extras/pkg-plist @@ -1,10 +1,6 @@ -lib/anjuta/anjuta-class-inheritance.plugin lib/anjuta/anjuta-editor.plugin lib/anjuta/anjuta-sample.plugin lib/anjuta/anjuta-scratchbox.plugin -lib/anjuta/libanjuta-class-inheritance.a -lib/anjuta/libanjuta-class-inheritance.la -lib/anjuta/libanjuta-class-inheritance.so lib/anjuta/libanjuta-editor.a lib/anjuta/libanjuta-editor.la lib/anjuta/libanjuta-editor.so @@ -91,8 +87,6 @@ share/locale/vi/LC_MESSAGES/anjuta-extras.mo share/locale/zh_CN/LC_MESSAGES/anjuta-extras.mo share/locale/zh_HK/LC_MESSAGES/anjuta-extras.mo share/locale/zh_TW/LC_MESSAGES/anjuta-extras.mo -share/pixmaps/anjuta/anjuta-class-inheritance-plugin-48.png -share/pixmaps/anjuta/anjuta-class-inheritance-plugin.svg share/pixmaps/anjuta/anjuta-editor-scintilla-plugin-48.png share/pixmaps/anjuta/anjuta-editor-scintilla-plugin.svg share/pixmaps/anjuta/anjuta-profiler-plugin-48.png diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index 24164518b05a..0729aa3c5dfd 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -3,12 +3,11 @@ # Whom: Dmitry Sivachenko <demon@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/devel/anjuta/Makefile,v 1.8 2010/06/23 19:53:50 kwm Exp $ +# $MCom: ports/devel/anjuta/Makefile,v 1.67 2010/11/13 08:07:29 kwm Exp $ # PORTNAME= anjuta -PORTVERSION= 2.30.2.1 -PORTREVISION= 1 +PORTVERSION= 2.32.1.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +19,8 @@ BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \ bash:${PORTSDIR}/shells/bash \ p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ - gladeui-1.9:${PORTSDIR}/devel/glade3 \ + gladeui-1.10:${PORTSDIR}/devel/glade3 \ + vala-0.10.0:${PORTSDIR}/lang/vala \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ gdl-1.3:${PORTSDIR}/x11-toolkits/gdl RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ @@ -39,11 +39,13 @@ USE_GETTEXT= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_PERL5= yes +USE_PYTHON= yes USE_GNOME= gnomeprefix gnomehack vte gtksourceview2 libgda4 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-symbol-db-shm=/tmp +CONFIGURE_ARGS= --with-symbol-db-shm=/tmp \ + --enable-introspection=no USE_LDCONFIG= yes GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \ anjuta-cvs-plugin.schemas \ @@ -55,19 +57,21 @@ GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \ anjuta-symbol-db.schemas \ anjuta-terminal-plugin.schemas \ file-manager.schemas \ - preferences.schemas + preferences.schemas \ + python-plugin-properties.schemas MAN1= anjuta.1 anjuta-launcher.1 OPTIONS= SVN "Build subversion plugin" off \ - DEVHELP "Build devhelp plugin" on + DEVHELP "Build devhelp plugin" on \ + GRAPHVIZ "Build inheritance plugin" on .include <bsd.port.pre.mk> .if defined(WITH_SVN) BUILD_DEPENDS+= svn:${PORTSDIR}/devel/subversion -LIB_DEPENDS+= apr-1.4:${PORTSDIR}/devel/apr1 \ - neon.27:${PORTSDIR}/www/neon29 +LIB_DEPENDS+= apr-1.4:${PORTSDIR}/devel/apr1 +LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29 RUN_DEPENDS+= svn:${PORTSDIR}/devel/subversion PLIST_SUB+= SVN="" .else @@ -76,7 +80,7 @@ PLIST_SUB+= SVN="@comment " .endif .if defined(WITH_DEVHELP) -LIB_DEPENDS+= devhelp-1.1:${PORTSDIR}/devel/devhelp +LIB_DEPENDS+= devhelp-2.1:${PORTSDIR}/devel/devhelp PLIST_SUB+= DEVHELP="" .else CONFIGURE_ARGS+=--disable-plugin-devhelp @@ -86,6 +90,16 @@ CONFIGURE_ARGS+=--disable-plugin-devhelp PLIST_SUB+= DEVHELP="" .endif +.if defined(WITH_GRAPHVIZ) +CONFIGURE_ARGS+=--enable-graphviz +BUILD_DEPENDS+= neato:${PORTSDIR}/graphics/graphviz +RUN_DEPENDS+= neato:${PORTSDIR}/graphics/graphviz +PLIST_SUB+= GRAPHVIZ="" +.else +CONFIGURE_ARGS+=--disable-graphviz +PLIST_SUB+= GRAPHVIZ="@comment " +.endif + post-patch: @${RM} ${WRKSRC}/plugins/debug-manager/anjuta-debug-manager.schemas diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo index 895950f1e557..0f448eb053c0 100644 --- a/devel/anjuta/distinfo +++ b/devel/anjuta/distinfo @@ -1,3 +1,2 @@ -MD5 (gnome2/anjuta-2.30.2.1.tar.bz2) = 9b511224d97500ac9b318588fbb441ab -SHA256 (gnome2/anjuta-2.30.2.1.tar.bz2) = ea32910ed047300934b6fe27a363b3dd57047222f8b664ff6dcb767a2fcd2726 -SIZE (gnome2/anjuta-2.30.2.1.tar.bz2) = 9405637 +SHA256 (gnome2/anjuta-2.32.1.0.tar.bz2) = e69c22e38623ff2a828c4214f6486169d1a42e5b4b221f26c581094bc059d638 +SIZE (gnome2/anjuta-2.32.1.0.tar.bz2) = 10197971 diff --git a/devel/anjuta/files/patch-plugins_gdb_debugger.c b/devel/anjuta/files/patch-plugins_gdb_debugger.c index 3667278cc5c4..b8895a4a1fd0 100644 --- a/devel/anjuta/files/patch-plugins_gdb_debugger.c +++ b/devel/anjuta/files/patch-plugins_gdb_debugger.c @@ -1,11 +1,11 @@ ---- plugins/gdb/debugger.c.orig 2009-12-19 15:21:02.000000000 -0500 -+++ plugins/gdb/debugger.c 2009-12-19 15:21:13.000000000 -0500 -@@ -54,7 +54,7 @@ +--- plugins/gdb/debugger.c.orig 2010-07-25 22:27:28.000000000 +0200 ++++ plugins/gdb/debugger.c 2010-09-01 12:00:35.000000000 +0200 +@@ -56,7 +56,7 @@ #define GDB_PROMPT "(gdb)" #define FILE_BUFFER_SIZE 1024 -#define GDB_PATH "gdb" +#define GDB_PATH "gdb66" + #define MAX_CHILDREN 25 /* Limit the number of variable children + * returned by debugger */ #define SUMMARY_MAX_LENGTH 90 /* Should be smaller than 4K to be displayed - * in GtkCellRendererCell */ - diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist index 59e4922c6548..534e4ca10c7a 100644 --- a/devel/anjuta/pkg-plist +++ b/devel/anjuta/pkg-plist @@ -11,9 +11,9 @@ 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-pkg-config-chooser.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 @@ -73,10 +73,8 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-help.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-indicable.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-iterable-tree.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-iterable.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-language-support.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-language.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-loader.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-macro.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-markable.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-message-manager.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-message-view.h @@ -87,10 +85,12 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-backend.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-manager.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-provider.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-snippets-manager.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-loader.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-savable.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol-manager.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol-query.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-terminal.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-todo.h @@ -103,6 +103,7 @@ include/libanjuta-1.0/libanjuta/libanjuta.h include/libanjuta-1.0/libanjuta/resources.h lib/anjuta/anjuta-build-basic-autotools.plugin lib/anjuta/anjuta-class-gen.plugin +%%GRAPHVIZ%%lib/anjuta/anjuta-class-inheritance.plugin lib/anjuta/anjuta-cvs.plugin lib/anjuta/anjuta-debug-manager.plugin %%DEVHELP%%lib/anjuta/anjuta-devhelp.plugin @@ -114,18 +115,21 @@ lib/anjuta/anjuta-glade.plugin lib/anjuta/anjuta-gtodo.plugin lib/anjuta/anjuta-language-cpp-java.plugin lib/anjuta/anjuta-loader.plugin -lib/anjuta/anjuta-macro.plugin lib/anjuta/anjuta-message-manager.plugin 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-python-autocomplete.py +lib/anjuta/anjuta-python-loader.plugin lib/anjuta/anjuta-run-program.plugin lib/anjuta/anjuta-search.plugin +lib/anjuta/anjuta-snippets-manager.plugin lib/anjuta/anjuta-starter.plugin %%SVN%%lib/anjuta/anjuta-subversion.plugin lib/anjuta/anjuta-terminal.plugin lib/anjuta/anjuta-tools.plugin +lib/anjuta/anjuta-vala.plugin lib/anjuta/file-manager.plugin lib/anjuta/gbf-am.plugin lib/anjuta/gbf-mkfile.plugin @@ -137,6 +141,8 @@ lib/anjuta/libanjuta-build-basic-autotools.la lib/anjuta/libanjuta-build-basic-autotools.so lib/anjuta/libanjuta-class-gen.la lib/anjuta/libanjuta-class-gen.so +%%GRAPHVIZ%%lib/anjuta/libanjuta-class-inheritance.la +%%GRAPHVIZ%%lib/anjuta/libanjuta-class-inheritance.so lib/anjuta/libanjuta-cvs-plugin.la lib/anjuta/libanjuta-cvs-plugin.so lib/anjuta/libanjuta-debug-manager.la @@ -157,10 +163,10 @@ lib/anjuta/libanjuta-gtodo.la lib/anjuta/libanjuta-gtodo.so lib/anjuta/libanjuta-language-cpp-java.la lib/anjuta/libanjuta-language-cpp-java.so +lib/anjuta/libanjuta-language-vala.la +lib/anjuta/libanjuta-language-vala.so lib/anjuta/libanjuta-loader.la lib/anjuta/libanjuta-loader.so -lib/anjuta/libanjuta-macro.la -lib/anjuta/libanjuta-macro.so lib/anjuta/libanjuta-message-view.la lib/anjuta/libanjuta-message-view.so lib/anjuta/libanjuta-patch.la @@ -171,10 +177,14 @@ 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-python-loader.la +lib/anjuta/libanjuta-python-loader.so lib/anjuta/libanjuta-run-program.la lib/anjuta/libanjuta-run-program.so lib/anjuta/libanjuta-search.la lib/anjuta/libanjuta-search.so +lib/anjuta/libanjuta-snippets-manager.la +lib/anjuta/libanjuta-snippets-manager.so lib/anjuta/libanjuta-sourceview.la lib/anjuta/libanjuta-sourceview.so lib/anjuta/libanjuta-starter.la @@ -201,6 +211,10 @@ lib/anjuta/libjs-support-plugin.la lib/anjuta/libjs-support-plugin.so lib/anjuta/liblanguage-manager.la lib/anjuta/liblanguage-manager.so +lib/anjuta/libpython_plugin.la +lib/anjuta/libpython_plugin.so +lib/anjuta/libpython_plugin.so.0 +lib/anjuta/python-plugin.plugin lib/anjuta/sourceview.plugin lib/anjuta/symbol-db.plugin lib/glade3/modules/libgladeanjuta.la @@ -208,6 +222,9 @@ lib/glade3/modules/libgladeanjuta.so lib/libanjuta.la lib/libanjuta.so lib/libanjuta.so.0 +lib/libanjuta-foocanvas.la +lib/libanjuta-foocanvas.so +lib/libanjuta-foocanvas.so.0 libdata/pkgconfig/libanjuta-1.0.pc share/anjuta/AUTHORS share/anjuta/GBF/AmFiles.pm @@ -227,11 +244,10 @@ share/anjuta/glade/anjuta-debug-manager.ui share/anjuta/glade/anjuta-document-manager.ui share/anjuta/glade/anjuta-editor-sourceview.ui share/anjuta/glade/anjuta-file-wizard.ui +share/anjuta/glade/anjuta-gdb.ui share/anjuta/glade/anjuta-git.ui -share/anjuta/glade/anjuta-glade.glade share/anjuta/glade/anjuta-language-cpp-java.ui share/anjuta/glade/anjuta-language-javascript.ui -share/anjuta/glade/anjuta-macro.ui share/anjuta/glade/anjuta-message-manager-plugin.ui share/anjuta/glade/anjuta-project-wizard.ui share/anjuta/glade/anjuta-run-program.ui @@ -248,6 +264,10 @@ share/anjuta/glade/gbf-am-dialogs.ui share/anjuta/glade/patch-plugin.ui share/anjuta/glade/preferences.ui share/anjuta/glade/project-import.ui +share/anjuta/glade/python-plugin-properties.ui +share/anjuta/glade/snippets-browser.ui +share/anjuta/glade/snippets-editor.ui +share/anjuta/glade/snippets-manager-preferences.ui share/anjuta/glade/start-with-import.png share/anjuta/glade/start-with-open.png share/anjuta/glade/start-with-wizard.png @@ -256,7 +276,6 @@ share/anjuta/gtodo/gtodo.xsl share/anjuta/gtodo/gtodo-plain.xsl share/anjuta/languages.xml share/anjuta/layout.xml -share/anjuta/macros.xml share/anjuta/profiles/default.profile share/anjuta/project/anjuta-plugin-logo.png share/anjuta/project/anjuta-plugin.wiz @@ -274,7 +293,6 @@ share/anjuta/project/cpp.wiz share/anjuta/project/cpp/configure.ac.tpl share/anjuta/project/cpp/po/POTFILES.in share/anjuta/project/cpp/src/Makefile.am.tpl -share/anjuta/project/cpp/src/cvsignore share/anjuta/project/cpp/src/main.cc share/anjuta/project/directory/project.anjuta share/anjuta/project/django-logo.png @@ -283,16 +301,7 @@ share/anjuta/project/gcj-logo.png share/anjuta/project/gcj.wiz share/anjuta/project/gcj/configure.ac.tpl share/anjuta/project/gcj/src/Makefile.am.tpl -share/anjuta/project/gnome-applet.wiz -share/anjuta/project/gnome-applet/HACKING -share/anjuta/project/gnome-applet/Makefile.am.tpl -share/anjuta/project/gnome-applet/autogen.sh -share/anjuta/project/gnome-applet/configure.ac.tpl -share/anjuta/project/gnome-applet/src/GNOME_Applet.server.in.in -share/anjuta/project/gnome-applet/src/Makefile.am.tpl -share/anjuta/project/gnome-applet/src/main.c share/anjuta/project/gnome-logo.png -share/anjuta/project/gnome/po/POTFILES.in share/anjuta/project/gtk-logo.png share/anjuta/project/gtk.wiz share/anjuta/project/gtk/po/POTFILES.in @@ -350,6 +359,13 @@ share/anjuta/project/mkfile/po/POTFILES.in share/anjuta/project/mkfile/project.anjuta share/anjuta/project/mkfile/src/Makefile.tpl share/anjuta/project/mkfile/src/main.c +share/anjuta/project/pygtk-logo.png +share/anjuta/project/pygtk.wiz +share/anjuta/project/pygtk/configure.ac.tpl +share/anjuta/project/pygtk/data/project.ui +share/anjuta/project/pygtk/project.anjuta +share/anjuta/project/pygtk/src/Makefile.am.tpl +share/anjuta/project/pygtk/src/main.py share/anjuta/project/python-logo.png share/anjuta/project/python.wiz share/anjuta/project/python/configure.ac.tpl @@ -372,14 +388,11 @@ share/anjuta/project/terminal/NEWS share/anjuta/project/terminal/README share/anjuta/project/terminal/autogen.sh share/anjuta/project/terminal/configure.ac.tpl -share/anjuta/project/terminal/cvsignore share/anjuta/project/terminal/po/ChangeLog share/anjuta/project/terminal/po/LINGUAS share/anjuta/project/terminal/po/POTFILES.in -share/anjuta/project/terminal/po/cvsignore share/anjuta/project/terminal/project.anjuta share/anjuta/project/terminal/src/Makefile.am.tpl -share/anjuta/project/terminal/src/cvsignore share/anjuta/project/terminal/src/main.c share/anjuta/project/wxwin-logo.png share/anjuta/project/wxwin.wiz @@ -401,6 +414,8 @@ share/anjuta/project/xlib/po/POTFILES.in share/anjuta/project/xlib/src/Makefile.am.tpl share/anjuta/project/xlib/src/main.c share/anjuta/sources.list +share/anjuta/snippets-global-variables.xml +share/anjuta/snippets.anjuta-snippets share/anjuta/tables.sql share/anjuta/tools/find-fixmes.pl share/anjuta/tools/prepare-changelog.pl @@ -413,12 +428,11 @@ share/anjuta/ui/anjuta-devhelp-simple.ui share/anjuta/ui/anjuta-devhelp.ui share/anjuta/ui/anjuta-document-manager.xml share/anjuta/ui/anjuta-git.xml -share/anjuta/ui/anjuta-glade.ui +share/anjuta/ui/anjuta-glade.xml share/anjuta/ui/anjuta-gtodo.ui share/anjuta/ui/anjuta-language-support-cpp-java.xml share/anjuta/ui/anjuta-language-javascript.xml share/anjuta/ui/anjuta-loader-plugin.ui -share/anjuta/ui/anjuta-macro.xml share/anjuta/ui/anjuta-message-manager.xml share/anjuta/ui/anjuta-patch.xml share/anjuta/ui/anjuta-project-manager.xml @@ -430,6 +444,8 @@ share/anjuta/ui/anjuta-terminal-plugin.xml share/anjuta/ui/anjuta-tools.xml share/anjuta/ui/anjuta.xml share/anjuta/ui/file-manager.xml +share/anjuta/ui/python-plugin.xml +share/anjuta/ui/snippets-manager-ui.xml share/anjuta/welcome.txt share/applications/anjuta.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS @@ -500,9 +516,7 @@ share/doc/libanjuta/IAnjutaIndicable.html share/doc/libanjuta/IAnjutaIterable.html share/doc/libanjuta/IAnjutaIterableTree.html share/doc/libanjuta/IAnjutaLanguage.html -share/doc/libanjuta/IAnjutaLanguageSupport.html share/doc/libanjuta/IAnjutaLoader.html -share/doc/libanjuta/IAnjutaMacro.html share/doc/libanjuta/IAnjutaMarkable.html share/doc/libanjuta/IAnjutaMessageManager.html share/doc/libanjuta/IAnjutaMessageView.html @@ -515,6 +529,7 @@ share/doc/libanjuta/IAnjutaStreamLoader.html share/doc/libanjuta/IAnjutaStreamSavable.html share/doc/libanjuta/IAnjutaSymbol.html share/doc/libanjuta/IAnjutaSymbolManager.html +share/doc/libanjuta/IAnjutaSymbolQuery.html share/doc/libanjuta/IAnjutaTerminal.html share/doc/libanjuta/IAnjutaTodo.html share/doc/libanjuta/IAnjutaVcs.html @@ -524,10 +539,12 @@ share/doc/libanjuta/anjuta-architecture.html share/doc/libanjuta/anjuta-architecture.png share/doc/libanjuta/content-block.html share/doc/libanjuta/debugger-states.png +share/doc/libanjuta/distribution.html share/doc/libanjuta/header-block.html share/doc/libanjuta/home.png share/doc/libanjuta/index.html share/doc/libanjuta/index.sgml +share/doc/libanjuta/internationalization.html share/doc/libanjuta/left.png share/doc/libanjuta/libanjuta-AnjutaPluginDescription.html share/doc/libanjuta/libanjuta-Debugging.html @@ -535,9 +552,6 @@ share/doc/libanjuta/libanjuta-Program-resources.html share/doc/libanjuta/libanjuta-Utilities.html share/doc/libanjuta/libanjuta-anjuta-convert.html share/doc/libanjuta/libanjuta-anjuta-encodings.html -share/doc/libanjuta/libanjuta-anjuta-enum-types.html -share/doc/libanjuta/libanjuta-anjuta-error.html -share/doc/libanjuta/libanjuta-anjuta-marshal.html share/doc/libanjuta/libanjuta-anjuta-utils-priv.html share/doc/libanjuta/libanjuta-anjuta-version.html share/doc/libanjuta/libanjuta-api.html @@ -844,6 +858,49 @@ share/gnome/help/anjuta-manual/fr/figures/signals.png share/gnome/help/anjuta-manual/fr/figures/stack.png share/gnome/help/anjuta-manual/fr/figures/symbol_browser.png share/gnome/help/anjuta-manual/fr/figures/tool-editor.png +share/gnome/help/anjuta-manual/ja/anjuta-manual.xml +share/gnome/help/anjuta-manual/ja/figures/add_edit_macro.png +share/gnome/help/anjuta-manual/ja/figures/anjuta-in-action.png +share/gnome/help/anjuta-manual/ja/figures/attach.png +share/gnome/help/anjuta-manual/ja/figures/brk_add.png +share/gnome/help/anjuta-manual/ja/figures/brk_dlg.png +share/gnome/help/anjuta-manual/ja/figures/configure_dlg.png +share/gnome/help/anjuta-manual/ja/figures/display_macro.png +share/gnome/help/anjuta-manual/ja/figures/editor_guides.png +share/gnome/help/anjuta-manual/ja/figures/editor_margins.png +share/gnome/help/anjuta-manual/ja/figures/editor_markers.png +share/gnome/help/anjuta-manual/ja/figures/file_menu.png +share/gnome/help/anjuta-manual/ja/figures/insert_text.png +share/gnome/help/anjuta-manual/ja/figures/keyword_macro.png +share/gnome/help/anjuta-manual/ja/figures/local_variables.png +share/gnome/help/anjuta-manual/ja/figures/menubar.png +share/gnome/help/anjuta-manual/ja/figures/message_win.png +share/gnome/help/anjuta-manual/ja/figures/new_file_wizard.png +share/gnome/help/anjuta-manual/ja/figures/open_file.png +share/gnome/help/anjuta-manual/ja/figures/open_file_multiple.png +share/gnome/help/anjuta-manual/ja/figures/prefs_print.png +share/gnome/help/anjuta-manual/ja/figures/print_dlg.png +share/gnome/help/anjuta-manual/ja/figures/print_preview.png +share/gnome/help/anjuta-manual/ja/figures/project-window.png +share/gnome/help/anjuta-manual/ja/figures/project_group.png +share/gnome/help/anjuta-manual/ja/figures/project_info.png +share/gnome/help/anjuta-manual/ja/figures/project_target.png +share/gnome/help/anjuta-manual/ja/figures/project_target_details.png +share/gnome/help/anjuta-manual/ja/figures/registers.png +share/gnome/help/anjuta-manual/ja/figures/save_as_file.png +share/gnome/help/anjuta-manual/ja/figures/search_expr.png +share/gnome/help/anjuta-manual/ja/figures/search_expr_basic.png +share/gnome/help/anjuta-manual/ja/figures/search_file_pattern.png +share/gnome/help/anjuta-manual/ja/figures/search_replace.png +share/gnome/help/anjuta-manual/ja/figures/search_setting.png +share/gnome/help/anjuta-manual/ja/figures/search_target.png +share/gnome/help/anjuta-manual/ja/figures/search_target_action.png +share/gnome/help/anjuta-manual/ja/figures/search_target_in.png +share/gnome/help/anjuta-manual/ja/figures/sharedlibs.png +share/gnome/help/anjuta-manual/ja/figures/signals.png +share/gnome/help/anjuta-manual/ja/figures/stack.png +share/gnome/help/anjuta-manual/ja/figures/symbol_browser.png +share/gnome/help/anjuta-manual/ja/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 @@ -1059,8 +1116,16 @@ share/gnome/help/anjuta-manual/zh_CN/figures/signals.png share/gnome/help/anjuta-manual/zh_CN/figures/stack.png share/gnome/help/anjuta-manual/zh_CN/figures/symbol_browser.png share/gnome/help/anjuta-manual/zh_CN/figures/tool-editor.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-anjuta.png +share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-anjuta.png +share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-anjuta.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-anjuta.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-anjuta.png share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-anjuta.svg +share/icons/hicolor/16x16/apps/anjuta.png +share/icons/hicolor/22x22/apps/anjuta.png +share/icons/hicolor/24x24/apps/anjuta.png +share/icons/hicolor/32x32/apps/anjuta.png share/icons/hicolor/48x48/apps/anjuta.png share/icons/hicolor/scalable/apps/anjuta.svg share/locale/ar/LC_MESSAGES/anjuta.mo @@ -1089,6 +1154,7 @@ 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 +share/locale/hy/LC_MESSAGES/anjuta.mo share/locale/id/LC_MESSAGES/anjuta.mo share/locale/it/LC_MESSAGES/anjuta.mo share/locale/ja/LC_MESSAGES/anjuta.mo @@ -1136,6 +1202,7 @@ share/omf/anjuta-manual/anjuta-manual-el.omf share/omf/anjuta-manual/anjuta-manual-es.omf share/omf/anjuta-manual/anjuta-manual-eu.omf share/omf/anjuta-manual/anjuta-manual-fr.omf +share/omf/anjuta-manual/anjuta-manual-ja.omf share/omf/anjuta-manual/anjuta-manual-oc.omf share/omf/anjuta-manual/anjuta-manual-sv.omf share/omf/anjuta-manual/anjuta-manual-th.omf @@ -1172,6 +1239,10 @@ share/pixmaps/anjuta/anjuta-build-16.png share/pixmaps/anjuta/anjuta-build-24.png share/pixmaps/anjuta/anjuta-build-basic-autotools-plugin-48.png share/pixmaps/anjuta/anjuta-build-basic-autotools-plugin.svg +share/pixmaps/anjuta/anjuta-class-gen-plugin-48.png +share/pixmaps/anjuta/anjuta-class-gen-plugin.svg +%%GRAPHVIZ%%share/pixmaps/anjuta/anjuta-class-inheritance-plugin-48.png +%%GRAPHVIZ%%share/pixmaps/anjuta/anjuta-class-inheritance-plugin.svg share/pixmaps/anjuta/anjuta-complete-16.png share/pixmaps/anjuta/anjuta-complete-24.png share/pixmaps/anjuta/anjuta-complete-auto-16.png @@ -1184,32 +1255,17 @@ share/pixmaps/anjuta/anjuta-debug-manager-plugin.svg %%DEVHELP%%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/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-interface-24.png -share/pixmaps/anjuta/element-interface-private-16.png -share/pixmaps/anjuta/element-interface-protected-16.png -share/pixmaps/anjuta/element-interface-public-16.png -share/pixmaps/anjuta/element-literal-16.png -share/pixmaps/anjuta/element-method-16.png -share/pixmaps/anjuta/element-method-24.png -share/pixmaps/anjuta/element-method-private-16.png -share/pixmaps/anjuta/element-method-protected-16.png -share/pixmaps/anjuta/element-method-public-16.png -share/pixmaps/anjuta/element-namespace-16.png -share/pixmaps/anjuta/element-property-16.png -share/pixmaps/anjuta/element-property-private-16.png -share/pixmaps/anjuta/element-property-protected-16.png -share/pixmaps/anjuta/element-property-public-16.png -share/pixmaps/anjuta/element-structure-16.png +share/pixmaps/anjuta/anjuta-file-manager-plugin-16.png +share/pixmaps/anjuta/anjuta-file-wizard-plugin-48.png +share/pixmaps/anjuta/anjuta-file-wizard-plugin.svg +share/pixmaps/anjuta/anjuta-gtodo-plugin-16.png +share/pixmaps/anjuta/anjuta-project-manager-plugin-16.png +share/pixmaps/anjuta/anjuta-snippets-manager.png +share/pixmaps/anjuta/anjuta-symbol-db-plugin-16.png +share/pixmaps/anjuta/anjuta-symbol-db-plugin.svg 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 -share/pixmaps/anjuta/anjuta-file-wizard-plugin.png share/pixmaps/anjuta/anjuta-fold-close-16.png share/pixmaps/anjuta/anjuta-fold-close-24.png share/pixmaps/anjuta/anjuta-fold-open-16.png @@ -1244,7 +1300,6 @@ share/pixmaps/anjuta/anjuta-language-manager-plugin.svg share/pixmaps/anjuta/anjuta-linemark-16.png share/pixmaps/anjuta/anjuta-loader-plugin-48.png share/pixmaps/anjuta/anjuta-loader-plugin.svg -share/pixmaps/anjuta/anjuta-macro.png share/pixmaps/anjuta/anjuta-messages-plugin-48.png share/pixmaps/anjuta/anjuta-messages-plugin.svg share/pixmaps/anjuta/anjuta-patch-plugin-48.png @@ -1281,15 +1336,34 @@ share/pixmaps/anjuta/anjuta-tools-plugin.svg share/pixmaps/anjuta/anjuta-watch-16.png share/pixmaps/anjuta/anjuta-watch-24.png share/pixmaps/anjuta/anjuta-watch.svg -share/pixmaps/anjuta/anjuta.png -share/pixmaps/anjuta/anjuta.svg share/pixmaps/anjuta/anjuta_logo.png share/pixmaps/anjuta/anjuta_splash.png share/pixmaps/anjuta/breakpoint.png -share/pixmaps/anjuta/class_logo.xpm share/pixmaps/anjuta/dir-project-plugin-48.png share/pixmaps/anjuta/directory-accept.png share/pixmaps/anjuta/directory.png +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-interface-24.png +share/pixmaps/anjuta/element-interface-private-16.png +share/pixmaps/anjuta/element-interface-protected-16.png +share/pixmaps/anjuta/element-interface-public-16.png +share/pixmaps/anjuta/element-literal-16.png +share/pixmaps/anjuta/element-method-16.png +share/pixmaps/anjuta/element-method-24.png +share/pixmaps/anjuta/element-method-private-16.png +share/pixmaps/anjuta/element-method-protected-16.png +share/pixmaps/anjuta/element-method-public-16.png +share/pixmaps/anjuta/element-namespace-16.png +share/pixmaps/anjuta/element-property-16.png +share/pixmaps/anjuta/element-property-private-16.png +share/pixmaps/anjuta/element-property-protected-16.png +share/pixmaps/anjuta/element-property-public-16.png +share/pixmaps/anjuta/element-structure-16.png share/pixmaps/anjuta/gbf-am-plugin-48.png share/pixmaps/anjuta/gbf-build.png share/pixmaps/anjuta/gbf-install.png @@ -1303,6 +1377,7 @@ share/pixmaps/anjuta/madeinanjuta.xcf share/pixmaps/anjuta/password.png share/pixmaps/anjuta/pointer.png share/pixmaps/anjuta/preferences-editor.png +share/pixmaps/anjuta/python_plugin.png share/pixmaps/anjuta/stack.png share/pixmaps/anjuta/start-with-import.png share/pixmaps/anjuta/starter_logo.png @@ -1325,6 +1400,8 @@ share/pixmaps/anjuta/vcs-updated.png @dirrm share/gnome/help/anjuta-manual/sv @dirrm share/gnome/help/anjuta-manual/oc/figures @dirrm share/gnome/help/anjuta-manual/oc +@dirrm share/gnome/help/anjuta-manual/ja/figures +@dirrm share/gnome/help/anjuta-manual/ja @dirrm share/gnome/help/anjuta-manual/fr/figures @dirrm share/gnome/help/anjuta-manual/fr @dirrm share/gnome/help/anjuta-manual/eu/figures @@ -1364,6 +1441,9 @@ share/pixmaps/anjuta/vcs-updated.png @dirrm share/anjuta/project/python/src @dirrm share/anjuta/project/python/po @dirrm share/anjuta/project/python +@dirrm share/anjuta/project/pygtk/src +@dirrm share/anjuta/project/pygtk/data +@dirrm share/anjuta/project/pygtk @dirrm share/anjuta/project/mkfile/src @dirrm share/anjuta/project/mkfile/po @dirrm share/anjuta/project/mkfile @@ -1384,10 +1464,6 @@ share/pixmaps/anjuta/vcs-updated.png @dirrm share/anjuta/project/gtk/src @dirrm share/anjuta/project/gtk/po @dirrm share/anjuta/project/gtk -@dirrm share/anjuta/project/gnome-applet/src -@dirrm share/anjuta/project/gnome-applet -@dirrm share/anjuta/project/gnome/po -@dirrm share/anjuta/project/gnome @dirrm share/anjuta/project/gcj/src @dirrm share/anjuta/project/gcj @dirrm share/anjuta/project/directory diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index 888c32e7fcf6..025744a6e06d 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/bug-buddy/Makefile,v 1.81 2010/03/30 07:21:31 avl Exp $ +# $MCom: ports/devel/bug-buddy/Makefile,v 1.86 2010/11/16 18:17:55 kwm Exp $ # PORTNAME= bug-buddy -PORTVERSION= 2.30.0 -PORTREVISION= 2 +PORTVERSION= 2.32.0 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -41,4 +41,8 @@ post-patch: s|gelf.h||g' \ ${WRKSRC}/configure +post-install: + @${LN} -fs ${PREFIX}/lib/gtk-2.0/modules/libgnomesegvhandler.so \ + ${PREFIX}/lib/gtk-2.0/modules/libgnomebreakpad.so + .include <bsd.port.mk> diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo index 9f4e9f0e4a4b..84c72dfa0e7a 100644 --- a/devel/bug-buddy/distinfo +++ b/devel/bug-buddy/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/bug-buddy-2.30.0.tar.bz2) = da34ace8a806cd1c901ae960184e2997 -SHA256 (gnome2/bug-buddy-2.30.0.tar.bz2) = 6e81a55bd252f552aa4aea180b8dbceb0898d2bf173e330c5c09f8fbdba66b05 -SIZE (gnome2/bug-buddy-2.30.0.tar.bz2) = 1192441 +MD5 (gnome2/bug-buddy-2.32.0.tar.bz2) = 86a84389c206396eba680e93288d04c8 +SHA256 (gnome2/bug-buddy-2.32.0.tar.bz2) = ffdc70fe4a59c0aef42b5b0b72b08f17db2b1d9f49ba2b68722334ddbee5e3ca +SIZE (gnome2/bug-buddy-2.32.0.tar.bz2) = 701052 diff --git a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc deleted file mode 100644 index 7007a9101cb3..000000000000 --- a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc +++ /dev/null @@ -1,55 +0,0 @@ ---- gnome-breakpad/gnome-breakpad.cc.orig 2009-02-16 15:24:48.000000000 +0100 -+++ gnome-breakpad/gnome-breakpad.cc 2009-02-22 16:25:50.000000000 +0100 -@@ -25,8 +25,14 @@ - #include <cassert> - #include <cstring> - -+#ifdef __FreeBSD__ -+#include <sys/param.h> -+#endif -+ -+#if !defined(__FreeBSD__) || __FreeBSD_version > 700024 - #include <libelf.h> - #include <gelf.h> -+#endif - - #include <sys/types.h> - #include <sys/stat.h> -@@ -264,6 +270,7 @@ find_in_debug_path (const char *filename - } - - -+#if !defined(__FreeBSD__) || __FreeBSD_version > 700024 - static gboolean - elf_has_debug_symbols (const char *filename) - { -@@ -316,7 +323,7 @@ elf_has_debug_symbols (const char *filen - elf_end (elf); - return false; - } -- -+#endif - - - -@@ -429,11 +436,18 @@ check_if_gdb () - _exit (1); - _exit(0); - } -- -+ -+#if !defined(__FreeBSD__) - mypath = g_file_read_link ("/proc/self/exe", NULL); -+#else -+ mypath = g_file_read_link ("/proc/curproc/file", NULL); -+#endif - if (mypath) -+#if !defined(__FreeBSD__) || __FreeBSD_version > 700024 - has_debug_symbols = elf_has_debug_symbols (mypath); -- -+#else -+ has_debug_symbols = TRUE; -+#endif - g_free (mypath); - - if (bugbuddy && gdb && has_debug_symbols) { diff --git a/devel/bug-buddy/files/patch-src_bug-buddy.c b/devel/bug-buddy/files/patch-src_bug-buddy.c new file mode 100644 index 000000000000..25c5a0a3f425 --- /dev/null +++ b/devel/bug-buddy/files/patch-src_bug-buddy.c @@ -0,0 +1,26 @@ +--- src/bug-buddy.c.orig 2010-09-27 16:25:15.000000000 +0200 ++++ src/bug-buddy.c 2010-11-16 19:16:24.000000000 +0100 +@@ -56,6 +56,10 @@ + + #include <libsoup/soup.h> + ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#endif ++ + #define USE_PROXY_KEY "/system/http_proxy/use_http_proxy" + #define PROXY_HOST_KEY "/system/http_proxy/host" + #define PROXY_PORT_KEY "/system/http_proxy/port" +@@ -1955,10 +1959,12 @@ + _exit(0); + } + ++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024 + if (!elf_has_debug_symbols (gopt_data.pid)) { + /* FIXME: Request PackageKit to install debug symbols packages */ + _exit(0); + } ++#endif + + } + diff --git a/devel/bug-buddy/files/patch-src_elf.c b/devel/bug-buddy/files/patch-src_elf.c new file mode 100644 index 000000000000..659058fe963c --- /dev/null +++ b/devel/bug-buddy/files/patch-src_elf.c @@ -0,0 +1,42 @@ +--- src/elf.c.orig 2010-11-16 18:43:40.000000000 +0100 ++++ src/elf.c 2010-11-16 18:59:11.000000000 +0100 +@@ -16,8 +16,15 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#endif ++ ++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024 + #include <libelf.h> + #include <gelf.h> ++#endif ++ + #include <stdio.h> + #include <fcntl.h> + #include <string.h> +@@ -61,7 +68,9 @@ + gboolean + elf_has_debug_symbols (gint pid) + { ++#if !defined(__FreeBSD__) + gchar *proc_path; ++#endif + gchar *filename; + int fd; + Elf *elf; +@@ -76,9 +85,13 @@ + return FALSE; + } + ++#if defined(__FreeBSD__) ++ filename = g_file_read_link ("/proc/curproc/file", NULL); ++#else + proc_path = g_strdup_printf ("/proc/%d/exe", pid); + filename = g_file_read_link (proc_path, NULL); + g_free (proc_path); ++#endif + if (!filename) + return FALSE; + diff --git a/devel/bug-buddy/files/patch-src_gdb-buddy.c b/devel/bug-buddy/files/patch-src_gdb-buddy.c new file mode 100644 index 000000000000..a15e1a2a0ddb --- /dev/null +++ b/devel/bug-buddy/files/patch-src_gdb-buddy.c @@ -0,0 +1,11 @@ +--- src/gdb-buddy.c.orig 2010-11-16 18:43:48.000000000 +0100 ++++ src/gdb-buddy.c 2010-11-16 18:54:28.000000000 +0100 +@@ -170,7 +170,7 @@ + link = g_strdup_printf ("/proc/%d/path/a.out", pid); + #else + /* if someone knows how to do this on BSD, please send a patch */ +- return NULL; ++ link = g_file_read_link ("/proc/curproc/file", NULL); + #endif + exe = g_file_read_link (link, &error); + diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist index 32c3dfcc8d0b..c8b6d1f69bfa 100644 --- a/devel/bug-buddy/pkg-plist +++ b/devel/bug-buddy/pkg-plist @@ -1,6 +1,7 @@ bin/bug-buddy -lib/gtk-2.0/modules/libgnomebreakpad.la lib/gtk-2.0/modules/libgnomebreakpad.so +lib/gtk-2.0/modules/libgnomesegvhandler.la +lib/gtk-2.0/modules/libgnomesegvhandler.so share/applications/bug-buddy.desktop %%DATADIR%%/bug-buddy.gtkbuilder %%DATADIR%%/gdb-cmd diff --git a/devel/crow/Makefile b/devel/crow/Makefile index 14f539bdf2bd..4267c394238b 100644 --- a/devel/crow/Makefile +++ b/devel/crow/Makefile @@ -19,6 +19,8 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 RUN_DEPENDS= xdg-desktop-menu:${PORTSDIR}/devel/xdg-utils +BROKEN= Doesn't build with Glibmm 2.25 + PROJECTHOST= nothing-personal USE_BZIP2= yes USE_GNOME= gnomehack gtk20 diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index 26465d7be7ef..d4f3d27dbdec 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -3,10 +3,10 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/devel/devhelp/Makefile,v 1.1 2010/06/23 12:12:25 kwm Exp $ +# $MCom: ports/devel/devhelp/Makefile,v 1.38 2010/09/28 09:09:20 kwm Exp $ PORTNAME= devhelp -PORTVERSION= 2.30.1 +PORTVERSION= 2.32.0 PORTEPOCH= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -51,8 +51,4 @@ post-patch: ${WRKSRC}/src/Makefile.in .endif -post-install: - @${MKDIR} ${PREFIX}/etc/gconf/schemas - @${CP} ${WRKSRC}/data/devhelp.schemas ${PREFIX}/etc/gconf/schemas - .include <bsd.port.post.mk> diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo index 00752246c60c..a132abcb5340 100644 --- a/devel/devhelp/distinfo +++ b/devel/devhelp/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/devhelp-2.30.1.tar.bz2) = 447413a54d3bec2480e9a290e261703d -SHA256 (gnome2/devhelp-2.30.1.tar.bz2) = a72d75fae489bc957f15ef203a6bf8fc9cf80f2730444912dc568476018d5335 -SIZE (gnome2/devhelp-2.30.1.tar.bz2) = 489222 +MD5 (gnome2/devhelp-2.32.0.tar.bz2) = c6690a45609caa00ecd9cd92f7d28915 +SHA256 (gnome2/devhelp-2.32.0.tar.bz2) = 61b342cbaf27379be9baa5df1f34c9464916601ec4378fa7e1c76fcc686553e4 +SIZE (gnome2/devhelp-2.32.0.tar.bz2) = 503689 diff --git a/devel/devhelp/files/patch-src_dh-base.c b/devel/devhelp/files/patch-src_dh-base.c deleted file mode 100644 index 3dbf1c71cf4e..000000000000 --- a/devel/devhelp/files/patch-src_dh-base.c +++ /dev/null @@ -1,14 +0,0 @@ ---- 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); -+ - } - - static void diff --git a/devel/devhelp/files/patch-src_dh-book-manager.c b/devel/devhelp/files/patch-src_dh-book-manager.c new file mode 100644 index 000000000000..a9d8640db7d8 --- /dev/null +++ b/devel/devhelp/files/patch-src_dh-book-manager.c @@ -0,0 +1,13 @@ +--- src/dh-book-manager.c.orig 2010-09-01 11:30:01.000000000 +0200 ++++ src/dh-book-manager.c 2010-09-01 11:31:03.000000000 +0200 +@@ -149,6 +149,10 @@ book_manager_add_books_in_data_dir (DhBo + dir = g_build_filename (data_dir, "devhelp", "books", NULL); + book_manager_add_from_dir (book_manager, dir); + g_free (dir); ++ ++ dir = g_build_filename (data_dir, "doc", NULL); ++ book_manager_add_from_dir (book_manager, dir); ++ g_free (dir); + } + + void diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist index 963290b7ae3f..4297730748eb 100644 --- a/devel/devhelp/pkg-plist +++ b/devel/devhelp/pkg-plist @@ -1,13 +1,15 @@ 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-keyword-model.h -include/devhelp-1.0/devhelp/dh-link.h -include/devhelp-1.0/devhelp/dh-search.h -include/devhelp-1.0/devhelp/dh-window.h +include/devhelp-2.0/devhelp/dh-assistant-view.h +include/devhelp-2.0/devhelp/dh-assistant.h +include/devhelp-2.0/devhelp/dh-base.h +include/devhelp-2.0/devhelp/dh-book-manager.h +include/devhelp-2.0/devhelp/dh-book-tree.h +include/devhelp-2.0/devhelp/dh-book.h +include/devhelp-2.0/devhelp/dh-error.h +include/devhelp-2.0/devhelp/dh-keyword-model.h +include/devhelp-2.0/devhelp/dh-link.h +include/devhelp-2.0/devhelp/dh-search.h +include/devhelp-2.0/devhelp/dh-window.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 @@ -15,11 +17,11 @@ include/devhelp-1.0/devhelp/dh-window.h %%GEDIT%%lib/gedit-2/plugins/devhelp/devhelp.py %%GEDIT%%lib/gedit-2/plugins/devhelp/devhelp.pyc %%GEDIT%%lib/gedit-2/plugins/devhelp/devhelp.pyo -lib/libdevhelp-1.a -lib/libdevhelp-1.la -lib/libdevhelp-1.so -lib/libdevhelp-1.so.1 -libdata/pkgconfig/libdevhelp-1.0.pc +lib/libdevhelp-2.a +lib/libdevhelp-2.la +lib/libdevhelp-2.so +lib/libdevhelp-2.so.1 +libdata/pkgconfig/libdevhelp-2.0.pc share/applications/devhelp.desktop share/devhelp/assistant/assistant.css share/devhelp/assistant/assistant.js @@ -110,8 +112,8 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo @dirrm share/devhelp/dtd @dirrm share/devhelp/assistant @dirrm share/devhelp -@dirrm include/devhelp-1.0/devhelp -@dirrm include/devhelp-1.0 +@dirrm include/devhelp-2.0/devhelp +@dirrm include/devhelp-2.0 @dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index ce1fb0e060e8..9443a9a741e6 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.111 2010/04/01 15:59:40 kwm Exp $ +# $MCom: ports/devel/gconf2/Makefile,v 1.124 2010/11/15 22:14:03 kwm Exp $ # PORTNAME= gconf2 -PORTVERSION= 2.28.1 -PORTREVISION?= 1 +PORTVERSION= 2.32.0 +PORTREVISION?= 2 CATEGORIES= devel gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -20,6 +20,9 @@ COMMENT= A configuration database system for GNOME USE_BZIP2= yes +LICENSE= LGPL20 +LICENSE_FILE= ${WRKSRC}/COPYING + .if !defined(REFERENCE_PORT) LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ @@ -28,7 +31,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ USE_GMAKE= yes USE_GETTEXT= yes USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \ - referencehack intlhack + referencehack intlhack dconf USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ @@ -37,7 +40,8 @@ CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAN1= gconftool-2.1 +MAN1= gconftool-2.1 gsettings-data-convert.1 \ + gsettings-schema-convert.1 OPTIONS= LDAP "Enable LDAP support" off @@ -52,6 +56,9 @@ CONFIGURE_ARGS+=--without-openldap PLIST_SUB+= LDAP="@comment " .endif +post-install: + -${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gio/modules + .include <bsd.port.post.mk> .endif diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index d216af850702..b7d4f13db58d 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/GConf-2.28.1.tar.bz2) = 27663faf0af4f6a6d534de9270f6d24a -SHA256 (gnome2/GConf-2.28.1.tar.bz2) = 53c477f9086057b0c84816a1c979e01537b862fbcacb6af4b62f8cffec4b3000 -SIZE (gnome2/GConf-2.28.1.tar.bz2) = 1476141 +MD5 (gnome2/GConf-2.32.0.tar.bz2) = b161da6a1ab090b649aed3111003b0bb +SHA256 (gnome2/GConf-2.32.0.tar.bz2) = 54dd1dd7f49928a9cc42574bef6ef0481753770fc19986dc2004bbb7fac977a0 +SIZE (gnome2/GConf-2.32.0.tar.bz2) = 1541688 diff --git a/devel/gconf2/files/patch-gsettings_gconfsettingsbackend.c b/devel/gconf2/files/patch-gsettings_gconfsettingsbackend.c new file mode 100644 index 000000000000..9742e9e91d2a --- /dev/null +++ b/devel/gconf2/files/patch-gsettings_gconfsettingsbackend.c @@ -0,0 +1,9 @@ +--- gsettings/gconfsettingsbackend.c.orig 2010-11-14 12:54:57.000000000 -0500 ++++ gsettings/gconfsettingsbackend.c 2010-11-14 12:55:08.000000000 -0500 +@@ -924,5 +924,5 @@ gconf_settings_backend_register (GIOModu + g_io_extension_point_implement (G_SETTINGS_BACKEND_EXTENSION_POINT_NAME, + GCONF_TYPE_SETTINGS_BACKEND, + "gconf", +- -1); ++ 10); + } diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index eb8bec29974a..010cc2f6ca21 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -1,8 +1,11 @@ bin/gconf-merge-tree bin/gconftool-2 +bin/gsettings-data-convert +bin/gsettings-schema-convert etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf %%LDAP%%etc/gconf/2/evoldap.conf etc/gconf/2/path +etc/xdg/autostart/gsettings-data-convert.desktop include/gconf/2/gconf/gconf-changeset.h include/gconf/2/gconf/gconf-client.h include/gconf/2/gconf/gconf-engine.h @@ -22,6 +25,10 @@ lib/GConf/2/libgconfbackend-oldxml.so lib/GConf/2/libgconfbackend-xml.a lib/GConf/2/libgconfbackend-xml.la lib/GConf/2/libgconfbackend-xml.so +lib/girepository-1.0/GConf-2.0.typelib +lib/gio/modules/libgsettingsgconfbackend.a +lib/gio/modules/libgsettingsgconfbackend.la +lib/gio/modules/libgsettingsgconfbackend.so lib/libgconf-2.a lib/libgconf-2.la lib/libgconf-2.so @@ -33,6 +40,7 @@ libexec/gconfd-2 share/aclocal/gconf-2.m4 share/dbus-1/system-services/org.gnome.GConf.Defaults.service share/dbus-1/services/org.gnome.GConf.service +share/gir-1.0/GConf-2.0.gir share/locale/am/LC_MESSAGES/GConf2.mo share/locale/ar/LC_MESSAGES/GConf2.mo share/locale/as/LC_MESSAGES/GConf2.mo @@ -67,6 +75,7 @@ share/locale/he/LC_MESSAGES/GConf2.mo share/locale/hi/LC_MESSAGES/GConf2.mo share/locale/hr/LC_MESSAGES/GConf2.mo share/locale/hu/LC_MESSAGES/GConf2.mo +share/locale/hy/LC_MESSAGES/GConf2.mo share/locale/id/LC_MESSAGES/GConf2.mo share/locale/is/LC_MESSAGES/GConf2.mo share/locale/it/LC_MESSAGES/GConf2.mo @@ -148,6 +157,8 @@ share/sgml/gconf/gconf-1.0.dtd @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy @dirrmtry share/locale/en@shaw/LC_MESSAGES @dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @@ -160,3 +171,5 @@ share/sgml/gconf/gconf-1.0.dtd @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true +@unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile index f44bac08a07b..f418af0b8cce 100644 --- a/devel/giggle/Makefile +++ b/devel/giggle/Makefile @@ -7,6 +7,7 @@ PORTNAME= giggle PORTVERSION= 0.5 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNOME diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile index d231083c80ca..9ed6a864a597 100644 --- a/devel/gio-fam-backend/Makefile +++ b/devel/gio-fam-backend/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.52 2010/05/04 09:44:51 kwm Exp $ +# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.65 2010/11/15 02:01:55 kwm Exp $ # PORTNAME= gio-fam-backend -PORTVERSION= 2.24.2 +PORTVERSION= 2.26.1 +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/}/ \ @@ -23,7 +24,6 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= FAM backend for GLib's GIO library USE_BZIP2= yes -USE_GETTEXT= yes BUILD_WRKSRC= ${WRKSRC}/gio/fam INSTALL_WRKSRC= ${BUILD_WRKSRC} GNU_CONFIGURE= yes diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo index e43ea4c4554a..0ef45aba0485 100644 --- a/devel/gio-fam-backend/distinfo +++ b/devel/gio-fam-backend/distinfo @@ -1,3 +1,2 @@ -MD5 (gnome2/glib-2.24.2.tar.bz2) = 8a6e45d7840460ed84288ebfd75782d4 -SHA256 (gnome2/glib-2.24.2.tar.bz2) = 3aeb521abd3642dd1224379f0e54915957e5010f888a4ae74afa0ad54da0160c -SIZE (gnome2/glib-2.24.2.tar.bz2) = 5326328 +SHA256 (gnome2/glib-2.26.1.tar.bz2) = 7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5 +SIZE (gnome2/glib-2.26.1.tar.bz2) = 6704686 diff --git a/devel/gir-repository-dbus/Makefile b/devel/gir-repository-dbus/Makefile deleted file mode 100644 index 48cb73e4361d..000000000000 --- a/devel/gir-repository-dbus/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: gir-repository-dbus -# Date created: 12 September 2009 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/gir-repository-dbus/Makefile,v 1.1 2009/09/16 02:05:10 avl Exp $ -# - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../devel/gir-repository - -PKGNAMESUFFIX= -dbus - -.include "${MASTERDIR}/bsd.gir.mk" diff --git a/devel/gir-repository/Makefile b/devel/gir-repository/Makefile index 37942954c509..c92dac7b8e5b 100644 --- a/devel/gir-repository/Makefile +++ b/devel/gir-repository/Makefile @@ -3,7 +3,7 @@ # Whom: Pawel Worach <pawel.worach@gmail.com> # # $FreeBSD$ -# $MCom: ports/devel/gir-repository/Makefile,v 1.16 2010/03/14 01:32:00 kwm Exp $ +# $MCom: ports/devel/gir-repository/Makefile,v 1.21 2010/10/24 16:26:19 avl Exp $ # MASTER_SITES= # Empty @@ -17,14 +17,10 @@ COMMENT= Introspection information for various libraries NO_BUILD= yes RUN_DEPENDS= ${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-repository-poppler \ - ${GIRDIR}/${libsoup_GIR}.gir:${PORTSDIR}/${libsoup_CATEGORY}/gir-repository-libsoup \ ${GIRDIR}/${dbus_GIR}.gir:${PORTSDIR}/${dbus_CATEGORY}/gir-repository-dbus \ - ${GIRDIR}/${gconf2_GIR}.gir:${PORTSDIR}/${gconf2_CATEGORY}/gir-repository-gconf2 \ ${GIRDIR}/${babl_GIR}.gir:${PORTSDIR}/${babl_CATEGORY}/gir-repository-babl \ - ${GIRDIR}/${nautilus_GIR}.gir:${PORTSDIR}/${nautilus_CATEGORY}/gir-repository-nautilus \ ${GIRDIR}/${gnomekeyring_GIR}.gir:${PORTSDIR}/${gnomekeyring_CATEGORY}/gir-repository-gnome-keyring \ ${GIRDIR}/${libnotify_GIR}.gir:${PORTSDIR}/${libnotify_CATEGORY}/gir-repository-libnotify \ - ${GIRDIR}/${gtksourceview2_GIR}.gir:${PORTSDIR}/${gtksourceview2_CATEGORY}/gir-repository-gtksourceview2 \ ${GIRDIR}/${vte_GIR}.gir:${PORTSDIR}/${vte_CATEGORY}/gir-repository-vte \ ${GIRDIR}/${goocanvas_GIR}.gir:${PORTSDIR}/${goocanvas_CATEGORY}/gir-repository-goocanvas diff --git a/devel/gir-repository/bsd.gir.mk b/devel/gir-repository/bsd.gir.mk index 62fea33aad2d..cb9b4f1d1b9f 100644 --- a/devel/gir-repository/bsd.gir.mk +++ b/devel/gir-repository/bsd.gir.mk @@ -1,6 +1,6 @@ PORTNAME= gir-repository PORTVERSION= 0.6.5 -PORTREVISION?= 4 +PORTREVISION?= 5 MAINTAINER= gnome@FreeBSD.org @@ -9,31 +9,12 @@ GIRDIR= ${LOCALBASE}/share/gir-1.0 poppler_CATEGORY= graphics poppler_GIR= Poppler-0.8 -libsoup_CATEGORY= devel -libsoup_GIR= Soup-2.4 -libsoup_GIR_TMPL= soup - -dbus_CATEGORY= devel -dbus_GIR= DBus-1.0 - -gconf2_CATEGORY= devel -gconf2_GIR= GConf-2.0 - babl_CATEGORY= x11 babl_GIR= Babl-0.1 -nautilus_CATEGORY= x11-fm -nautilus_GIR= Nautilus-1.0 - -gnomekeyring_CATEGORY= security -gnomekeyring_GIR= GnomeKeyring-2.0 - libnotify_CATEGORY= devel libnotify_GIR= Notify-0.4 -gtksourceview2_CATEGORY= x11-toolkits -gtksourceview2_GIR= GtkSource-2.2 - vte_CATEGORY= x11-toolkits vte_GIR= Vte-1.0 @@ -48,7 +29,7 @@ DIST_SUBDIR= gnome2 COMMENT?= Introspection information for ${GIR_NAME} BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -RUN_DEPENDS= ${GIRDIR}/Everything-1.0.gir:${PORTSDIR}/devel/gobject-introspection +RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection USE_BZIP2= yes GNU_CONFIGURE= yes @@ -68,44 +49,20 @@ PLIST= ${NONEXISTENT} _USE_GIR_ALL= dbus atk pango pangoxft poppler gtk gconf soup babl nautilusextension \ gnomekeyring webkit notify gnio clutter clutter_gtk clutter_cairo \ gstreamer gstbufferlist_h gstreamer_plugins_base gtksourceview vte \ - goocanvas gssdp gupnp unique gmenu wnck + goocanvas gssdp gupnp avahi unique gmenu wnck .if ${GIR_NAME} == "poppler" -LIB_DEPENDS+= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS+= poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk USE_GNOME+= gtk20 GIR_FILES= Poppler-0.8 CLEAR_DEPS+= Gdk-2.0 .endif -.if ${GIR_NAME} == "libsoup" -LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup -GIR_FILES= Soup-2.4 -DEP_NAMES= soup -.endif - -.if ${GIR_NAME} == "gconf2" -USE_GNOME+= gconf2 -GIR_FILES= GConf-2.0 -DEP_NAMES= gconf -.endif - .if ${GIR_NAME} == "babl" LIB_DEPENDS+= babl-0.1.0:${PORTSDIR}/x11/babl GIR_FILES= Babl-0.1 .endif -.if ${GIR_NAME} == "nautilus" -USE_GNOME+= nautilus2 -GIR_FILES= Nautilus-1.0 -DEP_NAMES= nautilusextension -CLEAR_DEPS+= Gtk-2.0 -.endif - -.if ${GIR_NAME} == "gnomekeyring" -LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring -GIR_FILES= GnomeKeyring-2.0 -.endif - .if ${GIR_NAME} == "libnotify" LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify USE_GNOME+= gtk20 @@ -114,19 +71,6 @@ DEP_NAMES= notify CLEAR_DEPS+= Gtk-2.0 .endif -.if ${GIR_NAME} == "dbus" -LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib -GIR_FILES= DBus-1.0 -LIB_FILES= DBus -.endif - -.if ${GIR_NAME} == "gtksourceview2" -USE_GNOME+= gtksourceview2 -GIR_FILES= GtkSource-2.2 -DEP_NAMES= gtksourceview -CLEAR_DEPS+= Gtk-2.0 -.endif - .if ${GIR_NAME} == "vte" USE_GNOME+= vte GIR_FILES= Vte-1.0 diff --git a/devel/gir-repository/files/patch-gir_Makefile.in b/devel/gir-repository/files/patch-gir_Makefile.in index 5c559acda3b4..8932e4d3fd19 100644 --- a/devel/gir-repository/files/patch-gir_Makefile.in +++ b/devel/gir-repository/files/patch-gir_Makefile.in @@ -1,5 +1,5 @@ ---- gir/Makefile.in.orig 2009-09-09 21:31:46.000000000 +0200 -+++ gir/Makefile.in 2010-04-07 15:17:19.000000000 +0200 +--- gir/Makefile.in.orig 2010-11-02 16:00:41.000000000 +0100 ++++ gir/Makefile.in 2010-11-02 16:02:11.000000000 +0100 @@ -86,7 +86,7 @@ host_triplet = @host@ @BUILD_GSSDP_TRUE@am__append_33 = GSSDP-1.0.gir @BUILD_GUPNP_TRUE@am__append_34 = GUPnP-1.0.gir @@ -36,7 +36,17 @@ @BUILD_POPPLER_TRUE@ $(INTROSPECTION_SCANNER) -v --namespace Poppler --nsversion=0.8 \ @BUILD_POPPLER_TRUE@ --add-include-path=$(srcdir) --add-include-path=. \ @BUILD_POPPLER_TRUE@ --include=GObject-2.0 \ -@@ -1384,16 +1384,16 @@ uninstall-am: uninstall-dist_girDATA uni +@@ -1228,7 +1228,8 @@ uninstall-am: uninstall-dist_girDATA uni + @BUILD_VTE_TRUE@ --pkg gtk+-2.0 \ + @BUILD_VTE_TRUE@ --pkg vte \ + @BUILD_VTE_TRUE@ --output $@ \ +-@BUILD_VTE_TRUE@ $(VTE_INCLUDEDIR)/vte/*.h ++@BUILD_VTE_TRUE@ -DVTE_COMPILATION \ ++@BUILD_VTE_TRUE@ $(VTE_INCLUDEDIR)/vte-0.0/vte/*.h + @BUILD_CLUTTER_TRUE@ClutterJson-0.8.gir: $(INTROSPECTION_SCANNER) + @BUILD_CLUTTER_TRUE@ $(INTROSPECTION_SCANNER) -v --namespace ClutterJson --nsversion=0.8 \ + @BUILD_CLUTTER_TRUE@ --add-include-path=$(srcdir) --add-include-path=. \ +@@ -1384,16 +1385,16 @@ uninstall-am: uninstall-dist_girDATA uni @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --output $@ \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(GSTFFT_INCLUDEDIR)/gst/fft/*h @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@GstInterfaces-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER) @@ -56,7 +66,7 @@ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@GstNetbuffer-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER) @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstNetbuffer --nsversion=0.10 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --add-include-path=$(srcdir) --add-include-path=. \ -@@ -1479,6 +1479,7 @@ uninstall-am: uninstall-dist_girDATA uni +@@ -1479,6 +1480,7 @@ uninstall-am: uninstall-dist_girDATA uni @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --include=Gst-0.10 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --include=GstBase-0.10 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --library=gstvideo-0.10 \ @@ -64,7 +74,7 @@ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --libtool="$(LIBTOOL)" \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --pkg gobject-2.0 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --pkg gstreamer-0.10 \ -@@ -1529,11 +1530,11 @@ uninstall-am: uninstall-dist_girDATA uni +@@ -1529,14 +1531,15 @@ uninstall-am: uninstall-dist_girDATA uni @BUILD_AVAHI_TRUE@ --output $@ \ @BUILD_AVAHI_TRUE@ --pkg avahi-gobject \ @BUILD_AVAHI_TRUE@ $(AVAHI_INCLUDEDIR)/*.h @@ -79,3 +89,7 @@ @BUILD_BABL_TRUE@ --libtool="$(LIBTOOL)" \ @BUILD_BABL_TRUE@ --output $@ \ @BUILD_BABL_TRUE@ --pkg babl \ ++@BUILD_BABL_TRUE@ -DBABL_INSIDE_BABL_H \ + @BUILD_BABL_TRUE@ $(BABL_INCLUDEDIR)/babl/*.h + @BUILD_UNIQUE_TRUE@Unique-1.0.gir: Gtk-2.0.gir $(INTROSPECTION_SCANNER) + @BUILD_UNIQUE_TRUE@ $(INTROSPECTION_SCANNER) -v --namespace Unique --nsversion=1.0 \ diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile index bdc4a6ea3913..1d7fa62b1be0 100644 --- a/devel/glade3/Makefile +++ b/devel/glade3/Makefile @@ -3,12 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/devel/glade3/Makefile,v 1.2 2009/04/24 05:51:34 kwm Exp $ +# $MCom: ports/devel/glade3/Makefile,v 1.44 2010/06/06 22:11:46 kwm Exp $ # PORTNAME= glade3 -PORTVERSION= 3.6.7 -PORTREVISION= 3 +PORTVERSION= 3.7.1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/glade3/distinfo b/devel/glade3/distinfo index ad531621f0b1..3f632bbdc756 100644 --- a/devel/glade3/distinfo +++ b/devel/glade3/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glade3-3.6.7.tar.bz2) = 0fbe06e4babb2adeaf9725577ff43395 -SHA256 (gnome2/glade3-3.6.7.tar.bz2) = 117905d5b52781e0ffa861e38f47acda0e6bff992c5015408be74a7669769f81 -SIZE (gnome2/glade3-3.6.7.tar.bz2) = 2244221 +MD5 (gnome2/glade3-3.7.1.tar.bz2) = 35dca20dd51aa1a1fd461d723abba95b +SHA256 (gnome2/glade3-3.7.1.tar.bz2) = e803ea266df3f35515f68d067ef2509411db190bba3d121e640244ae09c12cfd +SIZE (gnome2/glade3-3.7.1.tar.bz2) = 2550121 diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist index e08b19ee6725..971dde53a02c 100644 --- a/devel/glade3/pkg-plist +++ b/devel/glade3/pkg-plist @@ -7,8 +7,8 @@ include/libgladeui-1.0/gladeui/glade-base-editor.h include/libgladeui-1.0/gladeui/glade-builtins.h include/libgladeui-1.0/gladeui/glade-button-editor.h include/libgladeui-1.0/gladeui/glade-catalog.h -include/libgladeui-1.0/gladeui/glade-cell-renderer-button.h include/libgladeui-1.0/gladeui/glade-cell-renderer-editor.h +include/libgladeui-1.0/gladeui/glade-cell-renderer-icon.h include/libgladeui-1.0/gladeui/glade-clipboard-view.h include/libgladeui-1.0/gladeui/glade-clipboard.h include/libgladeui-1.0/gladeui/glade-column-types.h @@ -34,7 +34,6 @@ include/libgladeui-1.0/gladeui/glade-inspector.h include/libgladeui-1.0/gladeui/glade-label-editor.h include/libgladeui-1.0/gladeui/glade-model-data.h include/libgladeui-1.0/gladeui/glade-name-context.h -include/libgladeui-1.0/gladeui/glade-palette-item.h include/libgladeui-1.0/gladeui/glade-palette.h include/libgladeui-1.0/gladeui/glade-parameter.h include/libgladeui-1.0/gladeui/glade-placeholder.h @@ -65,22 +64,21 @@ lib/glade3/modules/libgladegtk.so lib/libgladeui-1.a lib/libgladeui-1.la lib/libgladeui-1.so -lib/libgladeui-1.so.9 +lib/libgladeui-1.so.10 libdata/pkgconfig/gladeui-1.0.pc share/applications/glade-3.desktop %%DOCSDIR%%/GladeApp.html %%DOCSDIR%%/GladeBaseEditor.html %%DOCSDIR%%/GladeClipboard.html %%DOCSDIR%%/GladeClipboardView.html -%%DOCSDIR%%/GladeCommand.html %%DOCSDIR%%/GladeDesignView.html -%%DOCSDIR%%/GladeEditor.html %%DOCSDIR%%/GladeEditorProperty.html %%DOCSDIR%%/GladeFixed.html %%DOCSDIR%%/GladeInspector.html %%DOCSDIR%%/GladePalette.html %%DOCSDIR%%/GladePlaceholder.html %%DOCSDIR%%/GladeProject.html +%%DOCSDIR%%/GladeProperty.html %%DOCSDIR%%/GladeWidget.html %%DOCSDIR%%/GladeWidgetAction.html %%DOCSDIR%%/catalog.html @@ -89,13 +87,14 @@ share/applications/glade-3.desktop %%DOCSDIR%%/dockables.html %%DOCSDIR%%/gladeui.devhelp %%DOCSDIR%%/gladeui.devhelp2 +%%DOCSDIR%%/gladeui-Glade-Parameter.html +%%DOCSDIR%%/gladeui-Glade-Utils.html +%%DOCSDIR%%/gladeui-GladeSignalEditor.html %%DOCSDIR%%/gladeui-GladePropertyClass.html -%%DOCSDIR%%/gladeui-GladeWidgetAdaptor.html -%%DOCSDIR%%/gladeui-glade-parameter.html -%%DOCSDIR%%/gladeui-glade-property.html -%%DOCSDIR%%/gladeui-glade-signal-editor.html -%%DOCSDIR%%/gladeui-glade-utils.html -%%DOCSDIR%%/gladeui-glade-xml-utils.html +%%DOCSDIR%%/gladeui-Xml-Utils.html +%%DOCSDIR%%/gladeui-glade-command.html +%%DOCSDIR%%/gladeui-glade-editor.html +%%DOCSDIR%%/gladeui-glade-widget-adaptor.html %%DOCSDIR%%/home.png %%DOCSDIR%%/index.html %%DOCSDIR%%/index.sgml @@ -395,6 +394,9 @@ share/gnome/help/glade/C/legal.xml share/gnome/help/glade/bg/figures/main-window.png share/gnome/help/glade/bg/glade.xml share/gnome/help/glade/bg/legal.xml +share/gnome/help/glade/cs/figures/main-window.png +share/gnome/help/glade/cs/glade.xml +share/gnome/help/glade/cs/legal.xml share/gnome/help/glade/de/figures/main-window.png share/gnome/help/glade/de/glade.xml share/gnome/help/glade/de/legal.xml @@ -431,6 +433,12 @@ share/gnome/help/glade/ru/legal.xml share/gnome/help/glade/sv/figures/main-window.png share/gnome/help/glade/sv/glade.xml share/gnome/help/glade/sv/legal.xml +share/gnome/help/glade/uk/figures/main-window.png +share/gnome/help/glade/uk/glade.xml +share/gnome/help/glade/uk/legal.xml +share/gnome/help/glade/zh_CN/figures/main-window.png +share/gnome/help/glade/zh_CN/glade.xml +share/gnome/help/glade/zh_CN/legal.xml share/icons/hicolor/16x16/apps/glade-3.png share/icons/hicolor/22x22/apps/glade-3.png share/icons/hicolor/24x24/apps/glade-3.png @@ -443,12 +451,14 @@ share/locale/bg/LC_MESSAGES/glade3.mo share/locale/bn/LC_MESSAGES/glade3.mo share/locale/bn_IN/LC_MESSAGES/glade3.mo share/locale/ca/LC_MESSAGES/glade3.mo +share/locale/ca@valencia/LC_MESSAGES/glade3.mo share/locale/cs/LC_MESSAGES/glade3.mo share/locale/da/LC_MESSAGES/glade3.mo share/locale/de/LC_MESSAGES/glade3.mo share/locale/el/LC_MESSAGES/glade3.mo share/locale/en_CA/LC_MESSAGES/glade3.mo share/locale/en_GB/LC_MESSAGES/glade3.mo +share/locale/en@shaw/LC_MESSAGES/glade3.mo share/locale/es/LC_MESSAGES/glade3.mo share/locale/et/LC_MESSAGES/glade3.mo share/locale/eu/LC_MESSAGES/glade3.mo @@ -497,6 +507,7 @@ share/locale/zh_HK/LC_MESSAGES/glade3.mo share/locale/zh_TW/LC_MESSAGES/glade3.mo share/omf/glade/glade-C.omf share/omf/glade/glade-bg.omf +share/omf/glade/glade-cs.omf share/omf/glade/glade-de.omf share/omf/glade/glade-el.omf share/omf/glade/glade-en_GB.omf @@ -509,7 +520,13 @@ share/omf/glade/glade-oc.omf share/omf/glade/glade-pt_BR.omf share/omf/glade/glade-ru.omf share/omf/glade/glade-sv.omf +share/omf/glade/glade-uk.omf +share/omf/glade/glade-zh_CN.omf @dirrm share/omf/glade +@dirrm share/gnome/help/glade/zh_CN/figures +@dirrm share/gnome/help/glade/zh_CN +@dirrm share/gnome/help/glade/uk/figures +@dirrm share/gnome/help/glade/uk @dirrm share/gnome/help/glade/sv/figures @dirrm share/gnome/help/glade/sv @dirrm share/gnome/help/glade/ru/figures @@ -534,6 +551,8 @@ share/omf/glade/glade-sv.omf @dirrm share/gnome/help/glade/el @dirrm share/gnome/help/glade/de/figures @dirrm share/gnome/help/glade/de +@dirrm share/gnome/help/glade/cs/figures +@dirrm share/gnome/help/glade/cs @dirrm share/gnome/help/glade/bg/figures @dirrm share/gnome/help/glade/bg @dirrm share/gnome/help/glade/C/figures @@ -572,7 +591,11 @@ share/omf/glade/glade-sv.omf @dirrmtry share/locale/mr @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/cs/LC_MESSAGES @dirrmtry share/locale/cs +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN diff --git a/devel/glib20-reference/bsd.gnome-reference.mk b/devel/glib20-reference/bsd.gnome-reference.mk index 682328ed9902..d09035b78d47 100644 --- a/devel/glib20-reference/bsd.gnome-reference.mk +++ b/devel/glib20-reference/bsd.gnome-reference.mk @@ -48,7 +48,6 @@ make-descr: .if !target(do-install) do-install: -. if !defined(NOPORTDOCS) . for d in ${BOOKS} if [ -d ${REFERENCE_SRC}/${d}/html ]; then \ ${MKDIR} ${DOCSDIR}/${d}; \ @@ -57,7 +56,6 @@ do-install: ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/${d}/{}" \; ; \ fi . endfor -. endif .endif .include <bsd.port.mk> diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 85450e0422a8..f67ff1396d89 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.166 2010/05/04 09:44:51 kwm Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.188 2010/11/15 02:01:55 kwm Exp $ # # !! DON'T FORGET ABOUT devel/gio-fam-backend !! PORTNAME= glib -PORTVERSION= 2.24.2 +PORTVERSION= 2.26.1 PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ @@ -26,10 +26,13 @@ COMMENT= Some useful routines of C programming (current stable version) LATEST_LINK= glib20 USE_BZIP2= yes +LICENSE= LGPL20 +LICENSE_FILE= ${WRKSRC}/COPYING .if !defined(REFERENCE_PORT) -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre \ + dbus-1.3:${PORTSDIR}/devel/dbus USE_GETTEXT= yes USE_AUTOTOOLS= libtool:22 @@ -42,6 +45,7 @@ USE_PERL5= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ --disable-man --without-xml-catalog \ + --disable-dtrace \ --with-pcre=system \ --disable-fam CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -74,8 +78,12 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/glib/gutils.c + @${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \ + ${WRKSRC}/gio/gdbusaddress.c ${WRKSRC}/gio/gdbusprivate.c \ + ${WRKSRC}/po/*.po post-install: + @${MKDIR} ${PREFIX}/share/GConf/gsettings -${PREFIX}/bin/gio-querymodules ${PREFIX}/lib/gio/modules .include <bsd.port.post.mk> diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index e43ea4c4554a..0ef45aba0485 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,3 +1,2 @@ -MD5 (gnome2/glib-2.24.2.tar.bz2) = 8a6e45d7840460ed84288ebfd75782d4 -SHA256 (gnome2/glib-2.24.2.tar.bz2) = 3aeb521abd3642dd1224379f0e54915957e5010f888a4ae74afa0ad54da0160c -SIZE (gnome2/glib-2.24.2.tar.bz2) = 5326328 +SHA256 (gnome2/glib-2.26.1.tar.bz2) = 7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5 +SIZE (gnome2/glib-2.26.1.tar.bz2) = 6704686 diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c index dfcb99209ea8..e2edc6938273 100644 --- a/devel/glib20/files/extra-patch-glib_gunicollate.c +++ b/devel/glib20/files/extra-patch-glib_gunicollate.c @@ -1,6 +1,6 @@ ---- glib/gunicollate.c.orig Thu Jun 8 17:24:10 2006 -+++ glib/gunicollate.c Thu Oct 19 20:12:50 2006 -@@ -26,10 +26,57 @@ +--- glib/gunicollate.c.orig ++++ glib/gunicollate.c +@@ -26,6 +26,10 @@ #include <wchar.h> #endif @@ -8,9 +8,17 @@ +#include <unicode/ustring.h> +#include <unicode/ucol.h> + - #include "glib.h" - #include "gunicodeprivate.h" - #include "galias.h" + #ifdef HAVE_CARBON + #include <CoreServices/CoreServices.h> + #endif +@@ -36,10 +40,53 @@ + #include "gstring.h" + #include "gstrfuncs.h" + #include "gtestutils.h" ++#include "gthread.h" + #ifndef __STDC_ISO_10646__ + #include "gconvert.h" + #endif +static gboolean icu_collator_initialized = FALSE; +static UCollator *icu_collator = NULL; @@ -54,11 +62,10 @@ + + return result; +} -+ + #ifdef _MSC_VER /* Workaround for bug in MSVCR80.DLL */ - static size_t -@@ -94,6 +141,28 @@ +@@ -127,6 +174,28 @@ g_return_val_if_fail (str1 != NULL, 0); g_return_val_if_fail (str2 != NULL, 0); @@ -87,11 +94,10 @@ str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE); str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE); -@@ -235,6 +304,26 @@ - gchar *str_norm; +@@ -419,6 +488,26 @@ g_return_val_if_fail (str != NULL, NULL); -+ + + init_icu_collator(); + if (icu_collator != NULL) + { @@ -111,6 +117,7 @@ + return result; + } + } - ++ str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE); + result = NULL; diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index a6d6851b09cf..80fcb92b20d5 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig 2010-03-03 21:31:46.000000000 -0500 -+++ configure 2010-03-03 21:47:47.000000000 -0500 -@@ -714,6 +714,9 @@ ac_includes_default="\ +--- configure.orig 2010-09-09 12:18:43.000000000 +0200 ++++ configure 2010-09-09 12:20:56.000000000 +0200 +@@ -575,6 +575,9 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif @@ -10,7 +10,16 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -@@ -23020,7 +23023,7 @@ _ACEOF +@@ -5187,7 +5190,7 @@ + fi + + GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" +-ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`" ++ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`" + + + if test "x$with_runtime_libdir" != "x"; then +@@ -22212,7 +22215,7 @@ fi done @@ -19,7 +28,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -@@ -25631,6 +25634,8 @@ fi +@@ -24815,6 +24818,8 @@ ;; esac fi @@ -28,3 +37,12 @@ if test x"$G_THREAD_CFLAGS" = x; then +@@ -27415,7 +27420,7 @@ + fi + + +-if test "x${enable_Bsymbolic}" == "xyes"; then ++if test "x${enable_Bsymbolic}" = "xyes"; then + GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions + fi + diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag index 5ee7fe3d539f..289bc3381903 100644 --- a/devel/glib20/files/patch-ag +++ b/devel/glib20/files/patch-ag @@ -1,21 +1,11 @@ ---- Makefile.in.orig 2008-02-12 00:16:23.000000000 +0100 -+++ Makefile.in 2008-02-12 00:16:23.000000000 +0100 -@@ -338,7 +338,7 @@ EXTRA_DIST = ChangeLog.pre-2-14 ChangeLo +--- Makefile.in.orig 2010-08-08 12:14:27.000000000 +0200 ++++ Makefile.in 2010-08-08 12:15:40.000000000 +0200 +@@ -418,7 +418,7 @@ gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in TEST_PROGS = - AUTOMAKE_OPTIONS = 1.7 + ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} -SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs +SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs DIST_SUBDIRS = $(SUBDIRS) build bin_SCRIPTS = glib-gettextize AM_CPPFLAGS = \ -@@ -356,7 +356,8 @@ BUILT_EXTRA_DIST = \ - config.h.win32 \ - gtk-doc.make - --configexecincludedir = $(libdir)/glib-2.0/include -+glibincludedir = $(includedir)/glib-2.0 -+configexecincludedir = $(glibincludedir) - configexecinclude_DATA = glibconfig.h - CONFIGURE_DEPENDENCIES = acglib.m4 - BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h diff --git a/devel/glib20/files/patch-gio_tests_gdbus-peer.c b/devel/glib20/files/patch-gio_tests_gdbus-peer.c new file mode 100644 index 000000000000..1ab76dc8c704 --- /dev/null +++ b/devel/glib20/files/patch-gio_tests_gdbus-peer.c @@ -0,0 +1,11 @@ +--- gio/tests/gdbus-peer.c.orig 2010-08-16 21:30:03.000000000 +0200 ++++ gio/tests/gdbus-peer.c 2010-08-16 23:13:32.000000000 +0200 +@@ -42,6 +42,8 @@ + #include <sys/socket.h> + #endif + ++#include <sys/socket.h> ++ + /* used in test_overflow */ + #ifdef G_OS_UNIX + #include <gio/gunixconnection.h> diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in index 352c0cf6031c..7175b8581c93 100644 --- a/devel/glib20/files/patch-glib::libcharset::Makefile.in +++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in @@ -1,15 +1,15 @@ ---- 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 +--- glib/libcharset/Makefile.in.orig 2010-08-08 12:46:01.000000000 +0200 ++++ glib/libcharset/Makefile.in 2010-08-08 12:46:01.000000000 +0200 +@@ -328,7 +328,7 @@ EXTRA_DIST = README config.charset ref-a codeset.m4 update.sh make-patch.sh libcharset-glib.patch TEST_PROGS = INCLUDES = \ -- -DLIBDIR=\"$(libdir)\" -I$(top_srcdir) -+ -DLIBDIR=\"$(prefix)/libdata\" -I$(top_srcdir) +- -DLIBDIR=\"$(libdir)\" $(config_h_INCLUDES) ++ -DLIBDIR=\"$(prefix)/libdata\" $(config_h_INCLUDES) noinst_LTLIBRARIES = libcharset.la libcharset_la_SOURCES = \ -@@ -286,8 +286,8 @@ libcharset_la_SOURCES = \ +@@ -336,8 +336,8 @@ libcharset_la_SOURCES = \ localcharset.h \ localcharset.c @@ -20,9 +20,9 @@ SUFFIXES = .sed .sin CLEANFILES = charset.alias ref-add.sed ref-del.sed all: all-am -@@ -498,7 +498,7 @@ install-data-am: +@@ -566,7 +566,7 @@ install-dvi: install-dvi-am - install-dvi: install-dvi-am + install-dvi-am: -install-exec-am: install-exec-local +install-exec-am: # install-exec-local diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in index 8dd7ae74bb82..d58efb723f81 100644 --- a/devel/glib20/files/patch-glib_Makefile.in +++ b/devel/glib20/files/patch-glib_Makefile.in @@ -1,17 +1,26 @@ ---- glib/Makefile.in.orig 2009-09-30 09:37:39.000000000 +0200 -+++ glib/Makefile.in 2009-09-30 09:38:48.000000000 +0200 -@@ -1396,7 +1396,7 @@ +--- glib/Makefile.in.orig 2010-08-08 12:46:01.000000000 +0200 ++++ glib/Makefile.in 2010-08-08 12:46:01.000000000 +0200 +@@ -529,7 +529,7 @@ BUILT_SOURCES = glibconfig-stamp $(am__a + # + DISTCLEANFILES = glibconfig-stamp glibconfig.h + CLEANFILES = $(am__append_2) +-configexecincludedir = $(libdir)/glib-2.0/include ++configexecincludedir = $(includedir)/glib-2.0 + nodist_configexecinclude_HEADERS = glibconfig.h + @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib + @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la +@@ -1530,7 +1530,7 @@ info: info-recursive info-am: -install-data-am: install-data-local install-dist_gdbSCRIPTS \ +install-data-am: install-data-local \ - install-glibincludeHEADERS install-glibsubincludeHEADERS + install-glibincludeHEADERS install-glibsubincludeHEADERS \ + install-tapsetDATA @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook -@@ -1603,9 +1603,7 @@ +@@ -1786,9 +1786,7 @@ distclean-local: libglib-gdb.py: libglib-gdb.py.in - sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py + $(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py -install-data-hook: libglib-gdb.py - mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR) @@ -19,4 +28,4 @@ +install-data-hook: @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) - @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) + @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in index b8842a6f46e4..12a20215a0bb 100644 --- a/devel/glib20/files/patch-gobject_Makefile.in +++ b/devel/glib20/files/patch-gobject_Makefile.in @@ -1,15 +1,15 @@ ---- gobject/Makefile.in.orig 2009-09-30 09:39:51.000000000 +0200 -+++ gobject/Makefile.in 2009-09-30 09:40:17.000000000 +0200 -@@ -1186,7 +1186,7 @@ info: info-recursive +--- gobject/Makefile.in.orig 2010-06-08 09:19:51.000000000 +0200 ++++ gobject/Makefile.in 2010-06-08 09:20:41.000000000 +0200 +@@ -1236,7 +1236,7 @@ info: info-recursive info-am: -install-data-am: install-data-local install-dist_gdbSCRIPTS \ +install-data-am: install-data-local \ - install-libgobjectincludeHEADERS + install-libgobjectincludeHEADERS install-tapsetDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook -@@ -1393,9 +1393,7 @@ libgobject-gdb.py: libgobject-gdb.py.in +@@ -1460,9 +1460,7 @@ libgobject-gdb.py: libgobject-gdb.py.in uninstall-gdb: -rm -r $(DESTDIR)$(datadir)/gdb @@ -19,4 +19,4 @@ +install-data-hook: @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) - @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) + @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index a760ba254490..d25cc3afcee1 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -1,13 +1,19 @@ +bin/gdbus bin/gio-querymodules +bin/glib-compile-schemas bin/glib-genmarshal bin/glib-gettextize bin/glib-mkenums bin/gobject-query +bin/gsettings bin/gtester bin/gtester-report +etc/bash_completion.d/gdbus-bash-completion.sh +etc/bash_completion.d/gsettings-bash-completion.sh include/gio-unix-2.0/gio/gdesktopappinfo.h include/gio-unix-2.0/gio/gfiledescriptorbased.h include/gio-unix-2.0/gio/gunixconnection.h +include/gio-unix-2.0/gio/gunixcredentialsmessage.h include/gio-unix-2.0/gio/gunixfdlist.h include/gio-unix-2.0/gio/gunixfdmessage.h include/gio-unix-2.0/gio/gunixinputstream.h @@ -25,8 +31,21 @@ include/glib-2.0/gio/gcontenttype.h include/glib-2.0/gio/gconverter.h include/glib-2.0/gio/gconverterinputstream.h include/glib-2.0/gio/gconverteroutputstream.h +include/glib-2.0/gio/gcredentials.h include/glib-2.0/gio/gdatainputstream.h include/glib-2.0/gio/gdataoutputstream.h +include/glib-2.0/gio/gdbusaddress.h +include/glib-2.0/gio/gdbusauthobserver.h +include/glib-2.0/gio/gdbusconnection.h +include/glib-2.0/gio/gdbuserror.h +include/glib-2.0/gio/gdbusintrospection.h +include/glib-2.0/gio/gdbusmessage.h +include/glib-2.0/gio/gdbusmethodinvocation.h +include/glib-2.0/gio/gdbusnameowning.h +include/glib-2.0/gio/gdbusnamewatching.h +include/glib-2.0/gio/gdbusproxy.h +include/glib-2.0/gio/gdbusserver.h +include/glib-2.0/gio/gdbusutils.h include/glib-2.0/gio/gdrive.h include/glib-2.0/gio/gemblem.h include/glib-2.0/gio/gemblemedicon.h @@ -64,9 +83,17 @@ include/glib-2.0/gio/gnativevolumemonitor.h include/glib-2.0/gio/gnetworkaddress.h include/glib-2.0/gio/gnetworkservice.h include/glib-2.0/gio/goutputstream.h +include/glib-2.0/gio/gpermission.h +include/glib-2.0/gio/gproxy.h +include/glib-2.0/gio/gproxyaddress.h +include/glib-2.0/gio/gproxyaddressenumerator.h +include/glib-2.0/gio/gproxyresolver.h include/glib-2.0/gio/gresolver.h include/glib-2.0/gio/gseekable.h +include/glib-2.0/gio/gsettings.h +include/glib-2.0/gio/gsettingsbackend.h include/glib-2.0/gio/gsimpleasyncresult.h +include/glib-2.0/gio/gsimplepermission.h include/glib-2.0/gio/gsocket.h include/glib-2.0/gio/gsocketaddress.h include/glib-2.0/gio/gsocketaddressenumerator.h @@ -101,6 +128,7 @@ include/glib-2.0/glib/gcompletion.h include/glib-2.0/glib/gconvert.h include/glib-2.0/glib/gdataset.h include/glib-2.0/glib/gdate.h +include/glib-2.0/glib/gdatetime.h include/glib-2.0/glib/gdir.h include/glib-2.0/glib/gerror.h include/glib-2.0/glib/gfileutils.h @@ -143,6 +171,7 @@ include/glib-2.0/glib/gtestutils.h include/glib-2.0/glib/gthread.h include/glib-2.0/glib/gthreadpool.h include/glib-2.0/glib/gtimer.h +include/glib-2.0/glib/gtimezone.h include/glib-2.0/glib/gtree.h include/glib-2.0/glib/gtypes.h include/glib-2.0/glib/gunicode.h @@ -153,6 +182,7 @@ include/glib-2.0/glib/gvarianttype.h include/glib-2.0/glib/gwin32.h include/glib-2.0/glibconfig.h include/glib-2.0/gmodule.h +include/glib-2.0/gobject/gbinding.h include/glib-2.0/gobject/gboxed.h include/glib-2.0/gobject/gclosure.h include/glib-2.0/gobject/genums.h @@ -200,8 +230,10 @@ libdata/pkgconfig/gobject-2.0.pc libdata/pkgconfig/gthread-2.0.pc share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 +share/aclocal/gsettings.m4 share/glib-2.0/gettext/mkinstalldirs share/glib-2.0/gettext/po/Makefile.in.in +share/glib-2.0/schemas/gschema.dtd share/locale/af/LC_MESSAGES/glib20.mo share/locale/am/LC_MESSAGES/glib20.mo share/locale/ar/LC_MESSAGES/glib20.mo @@ -245,6 +277,7 @@ share/locale/is/LC_MESSAGES/glib20.mo share/locale/it/LC_MESSAGES/glib20.mo share/locale/ja/LC_MESSAGES/glib20.mo share/locale/ka/LC_MESSAGES/glib20.mo +share/locale/kk/LC_MESSAGES/glib20.mo share/locale/kn/LC_MESSAGES/glib20.mo share/locale/ko/LC_MESSAGES/glib20.mo share/locale/ku/LC_MESSAGES/glib20.mo @@ -294,6 +327,11 @@ share/locale/yi/LC_MESSAGES/glib20.mo share/locale/zh_CN/LC_MESSAGES/glib20.mo share/locale/zh_HK/LC_MESSAGES/glib20.mo share/locale/zh_TW/LC_MESSAGES/glib20.mo +@exec mkdir -p %D/share/glib-2.0/schemas +@dirrmtry share/GConf/gsettings +@dirrmtry share/GConf +@exec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas +@dirrm share/glib-2.0/schemas @dirrm share/glib-2.0/gettext/po @dirrm share/glib-2.0/gettext @dirrm share/glib-2.0 @@ -342,6 +380,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy @dirrmtry share/locale/en@shaw/LC_MESSAGES @@ -358,3 +398,4 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@dirrmtry etc/bash_completion.d diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index ddd7668555b4..474e72284afe 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -3,12 +3,12 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glibmm/Makefile,v 1.90 2010/05/04 12:45:00 kwm Exp $ +# $MCom: ports/devel/glibmm/Makefile,v 1.96 2010/09/19 20:53:57 kwm Exp $ # PORTNAME= glibmm -PORTVERSION= 2.24.2 -PORTREVISION?= 2 +PORTVERSION= 2.25.5 +PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= GNOME diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo index b114a6abd3a1..58b35ff7b32f 100644 --- a/devel/glibmm/distinfo +++ b/devel/glibmm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glibmm-2.24.2.tar.bz2) = 48861fec006c2bd8e301d8e44cd12d3c -SHA256 (gnome2/glibmm-2.24.2.tar.bz2) = d4687c0b27f9c9f955a5306649008a1f8d8935edff916278fb7b65b44292ff7a -SIZE (gnome2/glibmm-2.24.2.tar.bz2) = 4481414 +MD5 (gnome2/glibmm-2.25.5.tar.bz2) = 280b57f81139f90709c867745c31be62 +SHA256 (gnome2/glibmm-2.25.5.tar.bz2) = a808bc5872556697a5bb221a3f9f14de9e8224b90a1900e7b37dcd0b3fcb0051 +SIZE (gnome2/glibmm-2.25.5.tar.bz2) = 5428421 diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist index 3cb8d30b0675..8799426c6758 100644 --- a/devel/glibmm/pkg-plist +++ b/devel/glibmm/pkg-plist @@ -1,12 +1,25 @@ include/giomm-%%API_VERSION%%/giomm.h include/giomm-%%API_VERSION%%/giomm/appinfo.h +include/giomm-%%API_VERSION%%/giomm/asyncinitable.h include/giomm-%%API_VERSION%%/giomm/asyncresult.h include/giomm-%%API_VERSION%%/giomm/bufferedinputstream.h include/giomm-%%API_VERSION%%/giomm/bufferedoutputstream.h include/giomm-%%API_VERSION%%/giomm/cancellable.h include/giomm-%%API_VERSION%%/giomm/contenttype.h +include/giomm-%%API_VERSION%%/giomm/credentials.h include/giomm-%%API_VERSION%%/giomm/datainputstream.h include/giomm-%%API_VERSION%%/giomm/dataoutputstream.h +include/giomm-%%API_VERSION%%/giomm/dbusauthobserver.h +include/giomm-%%API_VERSION%%/giomm/dbusconnection.h +include/giomm-%%API_VERSION%%/giomm/dbuserror.h +include/giomm-%%API_VERSION%%/giomm/dbusintrospection.h +include/giomm-%%API_VERSION%%/giomm/dbusmessage.h +include/giomm-%%API_VERSION%%/giomm/dbusmethodinvocation.h +include/giomm-%%API_VERSION%%/giomm/dbusownname.h +include/giomm-%%API_VERSION%%/giomm/dbusproxy.h +include/giomm-%%API_VERSION%%/giomm/dbusserver.h +include/giomm-%%API_VERSION%%/giomm/dbusutils.h +include/giomm-%%API_VERSION%%/giomm/dbuswatchname.h include/giomm-%%API_VERSION%%/giomm/desktopappinfo.h include/giomm-%%API_VERSION%%/giomm/drive.h include/giomm-%%API_VERSION%%/giomm/emblem.h @@ -42,12 +55,25 @@ include/giomm-%%API_VERSION%%/giomm/networkaddress.h include/giomm-%%API_VERSION%%/giomm/networkservice.h include/giomm-%%API_VERSION%%/giomm/outputstream.h include/giomm-%%API_VERSION%%/giomm/private/appinfo_p.h +include/giomm-%%API_VERSION%%/giomm/private/asyncinitable_p.h include/giomm-%%API_VERSION%%/giomm/private/asyncresult_p.h include/giomm-%%API_VERSION%%/giomm/private/bufferedinputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/bufferedoutputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/cancellable_p.h +include/giomm-%%API_VERSION%%/giomm/private/credentials_p.h include/giomm-%%API_VERSION%%/giomm/private/datainputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/dataoutputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbusauthobserver_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbusconnection_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbuserror_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbusintrospection_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbusmessage_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbusmethodinvocation_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbusownname_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbusproxy_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbusserver_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbusutils_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbuswatchname_p.h include/giomm-%%API_VERSION%%/giomm/private/desktopappinfo_p.h include/giomm-%%API_VERSION%%/giomm/private/drive_p.h include/giomm-%%API_VERSION%%/giomm/private/emblem_p.h @@ -81,14 +107,20 @@ include/giomm-%%API_VERSION%%/giomm/private/mountoperation_p.h include/giomm-%%API_VERSION%%/giomm/private/networkaddress_p.h include/giomm-%%API_VERSION%%/giomm/private/networkservice_p.h include/giomm-%%API_VERSION%%/giomm/private/outputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/proxy_p.h +include/giomm-%%API_VERSION%%/giomm/private/proxyaddress_p.h +include/giomm-%%API_VERSION%%/giomm/private/proxyresolver_p.h include/giomm-%%API_VERSION%%/giomm/private/resolver_p.h include/giomm-%%API_VERSION%%/giomm/private/seekable_p.h +include/giomm-%%API_VERSION%%/giomm/private/settings_p.h +include/giomm-%%API_VERSION%%/giomm/private/settingsbackend_p.h include/giomm-%%API_VERSION%%/giomm/private/socket_p.h include/giomm-%%API_VERSION%%/giomm/private/socketaddress_p.h include/giomm-%%API_VERSION%%/giomm/private/socketaddressenumerator_p.h include/giomm-%%API_VERSION%%/giomm/private/socketclient_p.h include/giomm-%%API_VERSION%%/giomm/private/socketconnectable_p.h include/giomm-%%API_VERSION%%/giomm/private/socketconnection_p.h +include/giomm-%%API_VERSION%%/giomm/private/socketcontrolmessage_p.h include/giomm-%%API_VERSION%%/giomm/private/socketlistener_p.h include/giomm-%%API_VERSION%%/giomm/private/socketservice_p.h include/giomm-%%API_VERSION%%/giomm/private/srvtarget_p.h @@ -96,18 +128,27 @@ include/giomm-%%API_VERSION%%/giomm/private/tcpconnection_p.h include/giomm-%%API_VERSION%%/giomm/private/themedicon_p.h include/giomm-%%API_VERSION%%/giomm/private/threadedsocketservice_p.h include/giomm-%%API_VERSION%%/giomm/private/unixconnection_p.h +include/giomm-%%API_VERSION%%/giomm/private/unixcredentialsmessage_p.h +include/giomm-%%API_VERSION%%/giomm/private/unixfdlist_p.h +include/giomm-%%API_VERSION%%/giomm/private/unixfdmessage_p.h include/giomm-%%API_VERSION%%/giomm/private/unixinputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/unixoutputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/volume_p.h include/giomm-%%API_VERSION%%/giomm/private/volumemonitor_p.h +include/giomm-%%API_VERSION%%/giomm/proxy.h +include/giomm-%%API_VERSION%%/giomm/proxyaddress.h +include/giomm-%%API_VERSION%%/giomm/proxyresolver.h include/giomm-%%API_VERSION%%/giomm/resolver.h include/giomm-%%API_VERSION%%/giomm/seekable.h +include/giomm-%%API_VERSION%%/giomm/settings.h +include/giomm-%%API_VERSION%%/giomm/settingsbackend.h include/giomm-%%API_VERSION%%/giomm/socket.h include/giomm-%%API_VERSION%%/giomm/socketaddress.h include/giomm-%%API_VERSION%%/giomm/socketaddressenumerator.h include/giomm-%%API_VERSION%%/giomm/socketclient.h include/giomm-%%API_VERSION%%/giomm/socketconnectable.h include/giomm-%%API_VERSION%%/giomm/socketconnection.h +include/giomm-%%API_VERSION%%/giomm/socketcontrolmessage.h include/giomm-%%API_VERSION%%/giomm/socketlistener.h include/giomm-%%API_VERSION%%/giomm/socketservice.h include/giomm-%%API_VERSION%%/giomm/srvtarget.h @@ -115,6 +156,9 @@ include/giomm-%%API_VERSION%%/giomm/tcpconnection.h include/giomm-%%API_VERSION%%/giomm/themedicon.h include/giomm-%%API_VERSION%%/giomm/threadedsocketservice.h include/giomm-%%API_VERSION%%/giomm/unixconnection.h +include/giomm-%%API_VERSION%%/giomm/unixcredentialsmessage.h +include/giomm-%%API_VERSION%%/giomm/unixfdlist.h +include/giomm-%%API_VERSION%%/giomm/unixfdmessage.h include/giomm-%%API_VERSION%%/giomm/unixinputstream.h include/giomm-%%API_VERSION%%/giomm/unixoutputstream.h include/giomm-%%API_VERSION%%/giomm/volume.h @@ -177,6 +221,9 @@ include/glibmm-%%API_VERSION%%/glibmm/private/thread_p.h include/glibmm-%%API_VERSION%%/glibmm/private/unicode_p.h include/glibmm-%%API_VERSION%%/glibmm/private/uriutils_p.h include/glibmm-%%API_VERSION%%/glibmm/private/valuearray_p.h +include/glibmm-%%API_VERSION%%/glibmm/private/variant_p.h +include/glibmm-%%API_VERSION%%/glibmm/private/variantiter_p.h +include/glibmm-%%API_VERSION%%/glibmm/private/varianttype_p.h include/glibmm-%%API_VERSION%%/glibmm/property.h include/glibmm-%%API_VERSION%%/glibmm/propertyproxy.h include/glibmm-%%API_VERSION%%/glibmm/propertyproxy_base.h @@ -204,6 +251,10 @@ include/glibmm-%%API_VERSION%%/glibmm/value.h include/glibmm-%%API_VERSION%%/glibmm/value_basictypes.h include/glibmm-%%API_VERSION%%/glibmm/value_custom.h include/glibmm-%%API_VERSION%%/glibmm/valuearray.h +include/glibmm-%%API_VERSION%%/glibmm/variant.h +include/glibmm-%%API_VERSION%%/glibmm/variant_basictypes.h +include/glibmm-%%API_VERSION%%/glibmm/variantiter.h +include/glibmm-%%API_VERSION%%/glibmm/varianttype.h include/glibmm-%%API_VERSION%%/glibmm/wrap.h include/glibmm-%%API_VERSION%%/glibmm/wrap_init.h include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 7d1b55e91d0a..caa250ad4313 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.189 2010/04/01 14:24:30 kwm Exp $ +# $MCom: ports/devel/gnome-vfs/Makefile,v 1.191 2010/09/29 12:30:29 kwm Exp $ # PORTNAME= gnome-vfs -PORTVERSION= 2.24.3 -PORTREVISION?= 1 +PORTVERSION= 2.24.4 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 5a89b547e6a7..3f8cf3778131 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-vfs-2.24.3.tar.bz2) = 646a2672c6e7e4ebff6a798b0fb7cc90 -SHA256 (gnome2/gnome-vfs-2.24.3.tar.bz2) = 3b0f342e79813bfc11d8e636db96b3ffd16c9ca48b07306410e09a3fd1065b4a -SIZE (gnome2/gnome-vfs-2.24.3.tar.bz2) = 1830456 +MD5 (gnome2/gnome-vfs-2.24.4.tar.bz2) = a05fab03eeef10a47dd156b758982f2e +SHA256 (gnome2/gnome-vfs-2.24.4.tar.bz2) = 62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa +SIZE (gnome2/gnome-vfs-2.24.4.tar.bz2) = 1890370 diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure index 7865fc3fbb2c..e44e93476014 100644 --- a/devel/gnome-vfs/files/patch-configure +++ b/devel/gnome-vfs/files/patch-configure @@ -1,54 +1,37 @@ ---- configure.orig 2009-10-10 11:55:11.000000000 -0400 -+++ configure 2009-10-10 11:55:14.000000000 -0400 -@@ -8433,7 +8433,7 @@ fi - +--- configure.orig 2010-09-29 07:03:15.000000000 +0000 ++++ configure 2010-09-29 07:09:42.000000000 +0000 +@@ -8424,7 +8424,7 @@ + # On IRIX 5.3, sys/types and inttypes.h are conflicting. for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h sys/sysmacros.h - do - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -14864,6 +14864,8 @@ $as_echo_n "checking for LC_MESSAGES... - if test "${am_cv_val_LC_MESSAGES+set}" = set; then - $as_echo_n "(cached) " >&6 - else -+ ac_check_lib_save_LIBS=$LIBS -+ LIBS="-lintl $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -14911,6 +14913,7 @@ fi - rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 - $as_echo "$am_cv_val_LC_MESSAGES" >&6; } -@@ -16395,6 +16398,7 @@ as_val=`eval 'as_val=${'$as_ac_var'} + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +@@ -14465,6 +14465,7 @@ cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + #define HAVE_NGETTEXT 1 _ACEOF + LIBS="-lintl $LIBS" have_ngettext=yes else - { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -@@ -26068,7 +26072,7 @@ if test "${openssl_libs+set}" = set; the + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +@@ -17694,7 +17695,7 @@ $as_echo_n "(cached) " >&6 else - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" + LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26363,7 +26367,7 @@ if test "${openssl_libs+set}" = set; the + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -17824,7 +17825,7 @@ $as_echo_n "(cached) " >&6 else - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" + LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in index 6567e62042f2..68798e37cc53 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.26 2010/04/02 21:50:06 kwm Exp $ +# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.28 2010/09/29 12:30:29 kwm Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in index 0fc15088ae8b..b9dc1ffa789a 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.26 2010/04/02 21:50:06 kwm Exp $ +# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.28 2010/09/29 12:30:29 kwm Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 5d88f02a9c98..a093619c8b0e 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -3,11 +3,11 @@ # Whom: Alexander Logvinov <avl@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gobject-introspection/Makefile,v 1.8 2010/04/22 15:11:23 kwm Exp $ +# $MCom: ports/devel/gobject-introspection/Makefile,v 1.26 2010/10/07 10:28:00 kwm Exp $ # PORTNAME= gobject-introspection -PORTVERSION= 0.6.14 +PORTVERSION= 0.9.12 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -22,7 +22,7 @@ LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack glib20 +USE_GNOME= gnomehack glib20 ltverhack USE_PYTHON= yes USE_BISON= both USE_GETTEXT= yes @@ -32,6 +32,10 @@ MAKE_JOBS_UNSAFE=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --disable-tests + +# Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260 +MAKE_ENV= HOME=${WRKDIR} MAN1= g-ir-compiler.1 g-ir-generate.1 g-ir-scanner.1 diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo index cce161879a1b..57ea68928bcd 100644 --- a/devel/gobject-introspection/distinfo +++ b/devel/gobject-introspection/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gobject-introspection-0.6.14.tar.bz2) = 7ea9be9a347b5c408fd3c3907803de9b -SHA256 (gnome2/gobject-introspection-0.6.14.tar.bz2) = c4713bcbcebb06861738a8f630ab05289666e631f42f7abbf2e836978db7eba6 -SIZE (gnome2/gobject-introspection-0.6.14.tar.bz2) = 763182 +MD5 (gnome2/gobject-introspection-0.9.12.tar.bz2) = 260ba5e77b5c0de0e7d8faf63ecbfee7 +SHA256 (gnome2/gobject-introspection-0.9.12.tar.bz2) = 9c0060d66d14a060057a1fc005be73675a1b8a00d4968ce8e78ff2d6b9f84e81 +SIZE (gnome2/gobject-introspection-0.9.12.tar.bz2) = 1050788 diff --git a/devel/gobject-introspection/files/patch-gir_Makefile.in b/devel/gobject-introspection/files/patch-gir_Makefile.in index f56e9f69b115..f25f14725aef 100644 --- a/devel/gobject-introspection/files/patch-gir_Makefile.in +++ b/devel/gobject-introspection/files/patch-gir_Makefile.in @@ -1,15 +1,15 @@ ---- gir/Makefile.in.orig 2010-06-06 15:58:29.000000000 -0400 -+++ gir/Makefile.in 2010-06-06 15:59:15.000000000 -0400 -@@ -436,14 +436,13 @@ GLib_2_0_gir_SCANNERFLAGS = --noclosure +--- gir/Makefile.in.orig 2010-09-29 01:50:46.000000000 +0000 ++++ gir/Makefile.in 2010-09-29 01:52:35.000000000 +0000 +@@ -393,13 +393,13 @@ GLib_2_0_gir_PACKAGES = glib-2.0 - GLib_2_0_gir_CFLAGS = $(CPPFLAGS) \ + GLib_2_0_gir_CFLAGS = \ -I$(GLIB_INCLUDEDIR) \ - -I$(GLIB_LIBDIR)/glib-2.0/include \ ++ -I$(GLIB_INCLUDEDIR)/.. \ -DGETTEXT_PACKAGE=Dummy \ -DGLIB_COMPILATION \ -D__G_I18N_LIB_H__ - GLib_2_0_gir_ASSERTIONS = GLib-2.0.xpath GLib_2_0_gir_FILES = \ - $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \ + $(GLIB_INCLUDEDIR)/glibconfig.h \ diff --git a/devel/gobject-introspection/files/patch-girepository_ginfo.c b/devel/gobject-introspection/files/patch-girepository_ginfo.c deleted file mode 100644 index 794bf443c8aa..000000000000 --- a/devel/gobject-introspection/files/patch-girepository_ginfo.c +++ /dev/null @@ -1,46 +0,0 @@ ---- girepository/ginfo.c.orig 2010-06-01 15:48:36.000000000 -0400 -+++ girepository/ginfo.c 2010-06-06 16:02:36.000000000 -0400 -@@ -2110,6 +2110,9 @@ g_constant_info_get_type (GIConstantInfo - return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + 8); - } - -+#define DO_ALIGNED_COPY(dest_addr, src_addr, type) \ -+ memcpy((dest_addr), (src_addr), sizeof(type)) -+ - gint - g_constant_info_get_value (GIConstantInfo *info, - GArgument *value) -@@ -2148,16 +2151,16 @@ g_constant_info_get_value (GIConstantInf - value->v_uint32 = *(guint32*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_INT64: -- value->v_int64 = *(gint64*)&rinfo->typelib->data[blob->offset]; -+ DO_ALIGNED_COPY(&value->v_int64, &rinfo->typelib->data[blob->offset], gint64); - break; - case GI_TYPE_TAG_UINT64: -- value->v_uint64 = *(guint64*)&rinfo->typelib->data[blob->offset]; -+ DO_ALIGNED_COPY(&value->v_uint64, &rinfo->typelib->data[blob->offset], guint64); - break; - case GI_TYPE_TAG_FLOAT: -- value->v_float = *(gfloat*)&rinfo->typelib->data[blob->offset]; -+ DO_ALIGNED_COPY(&value->v_float, &rinfo->typelib->data[blob->offset], gfloat); - break; - case GI_TYPE_TAG_DOUBLE: -- value->v_double = *(gdouble*)&rinfo->typelib->data[blob->offset]; -+ DO_ALIGNED_COPY(&value->v_double, &rinfo->typelib->data[blob->offset], gdouble); - break; - case GI_TYPE_TAG_TIME_T: - value->v_long = *(long*)&rinfo->typelib->data[blob->offset]; -@@ -2175,10 +2178,10 @@ g_constant_info_get_value (GIConstantInf - value->v_uint = *(guint*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_LONG: -- value->v_long = *(glong*)&rinfo->typelib->data[blob->offset]; -+ DO_ALIGNED_COPY(&value->v_long, &rinfo->typelib->data[blob->offset], glong); - break; - case GI_TYPE_TAG_ULONG: -- value->v_ulong = *(gulong*)&rinfo->typelib->data[blob->offset]; -+ DO_ALIGNED_COPY(&value->v_ulong, &rinfo->typelib->data[blob->offset], gulong); - break; - } - } diff --git a/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py b/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py deleted file mode 100644 index cb77d1c7ac7b..000000000000 --- a/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py +++ /dev/null @@ -1,11 +0,0 @@ ---- giscanner/sourcescanner.py.orig -+++ giscanner/sourcescanner.py -@@ -196,7 +196,7 @@ class SourceSymbol(object): - class SourceScanner(object): - - def __init__(self): -- with LibtoolImporter: -+ with LibtoolImporter(None, None): - from giscanner._giscanner import SourceScanner - self._scanner = SourceScanner() - self._filenames = [] diff --git a/devel/gobject-introspection/files/patch-giscanner_xmlwriter.py b/devel/gobject-introspection/files/patch-giscanner_xmlwriter.py deleted file mode 100644 index 94b3ca939d52..000000000000 --- a/devel/gobject-introspection/files/patch-giscanner_xmlwriter.py +++ /dev/null @@ -1,11 +0,0 @@ ---- giscanner/xmlwriter.py.orig -+++ giscanner/xmlwriter.py -@@ -67,7 +67,7 @@ def collect_attributes(tag_name, attributes, self_indent, - return attr_value - - --with LibtoolImporter: -+with LibtoolImporter(None, None): - from giscanner._giscanner import collect_attributes - - diff --git a/devel/gobject-introspection/files/patch-tests_Makefile.in b/devel/gobject-introspection/files/patch-tests_Makefile.in new file mode 100644 index 000000000000..a96e8a48d708 --- /dev/null +++ b/devel/gobject-introspection/files/patch-tests_Makefile.in @@ -0,0 +1,18 @@ +--- tests/Makefile.in.orig 2010-09-21 16:31:48.000000000 +0000 ++++ tests/Makefile.in 2010-09-21 16:33:10.000000000 +0000 +@@ -819,6 +819,7 @@ + $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \ + --namespace=Everything --nsversion=1.0 \ + --add-include-path=$(top_builddir)/gir --include=Gio-2.0 \ ++ --libtool="$(LIBTOOL)" \ + --library=libeverything-1.0.la --output=$@ \ + everything.h everything.c + +@@ -826,6 +827,7 @@ + $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \ + --namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=1.0 \ + --add-include-path=$(top_builddir)/gir --include=Gio-2.0 \ ++ --libtool="$(LIBTOOL)" \ + --library=libgimarshallingtests-1.0.la --output=$@ \ + $(srcdir)/gimarshallingtests.h $(srcdir)/gimarshallingtests.c + diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist index 7588b683930d..c39c55aa80c4 100644 --- a/devel/gobject-introspection/pkg-plist +++ b/devel/gobject-introspection/pkg-plist @@ -1,14 +1,30 @@ +bin/g-ir-annotation-tool bin/g-ir-compiler bin/g-ir-generate bin/g-ir-scanner +include/gobject-introspection-1.0/giarginfo.h include/gobject-introspection-1.0/gibaseinfo.h +include/gobject-introspection-1.0/gicallableinfo.h +include/gobject-introspection-1.0/giconstantinfo.h +include/gobject-introspection-1.0/gienuminfo.h +include/gobject-introspection-1.0/gierrordomaininfo.h +include/gobject-introspection-1.0/gifieldinfo.h include/gobject-introspection-1.0/gifunctioninfo.h +include/gobject-introspection-1.0/giinterfaceinfo.h +include/gobject-introspection-1.0/giobjectinfo.h +include/gobject-introspection-1.0/gipropertyinfo.h +include/gobject-introspection-1.0/giregisteredtypeinfo.h include/gobject-introspection-1.0/girepository.h include/gobject-introspection-1.0/girffi.h +include/gobject-introspection-1.0/gisignalinfo.h +include/gobject-introspection-1.0/gistructinfo.h +include/gobject-introspection-1.0/gitypeinfo.h include/gobject-introspection-1.0/gitypelib.h include/gobject-introspection-1.0/gitypes.h -lib/girepository-1.0/Everything-1.0.typelib -lib/girepository-1.0/GIMarshallingTests-1.0.typelib +include/gobject-introspection-1.0/giunioninfo.h +include/gobject-introspection-1.0/givfuncinfo.h +lib/girepository-1.0/DBus-1.0.typelib +lib/girepository-1.0/DBusGLib-1.0.typelib lib/girepository-1.0/GIRepository-2.0.typelib lib/girepository-1.0/GL-1.0.typelib lib/girepository-1.0/GLib-2.0.typelib @@ -29,6 +45,9 @@ lib/gobject-introspection/giscanner/__init__.pyo lib/gobject-introspection/giscanner/_giscanner.a lib/gobject-introspection/giscanner/_giscanner.la lib/gobject-introspection/giscanner/_giscanner.so +lib/gobject-introspection/giscanner/annotationmain.py +lib/gobject-introspection/giscanner/annotationmain.pyc +lib/gobject-introspection/giscanner/annotationmain.pyo lib/gobject-introspection/giscanner/annotationparser.py lib/gobject-introspection/giscanner/annotationparser.pyc lib/gobject-introspection/giscanner/annotationparser.pyo @@ -38,30 +57,36 @@ lib/gobject-introspection/giscanner/ast.pyo lib/gobject-introspection/giscanner/cachestore.py lib/gobject-introspection/giscanner/cachestore.pyc lib/gobject-introspection/giscanner/cachestore.pyo +lib/gobject-introspection/giscanner/codegen.py +lib/gobject-introspection/giscanner/codegen.pyc +lib/gobject-introspection/giscanner/codegen.pyo lib/gobject-introspection/giscanner/config.py lib/gobject-introspection/giscanner/config.pyc lib/gobject-introspection/giscanner/config.pyo lib/gobject-introspection/giscanner/dumper.py lib/gobject-introspection/giscanner/dumper.pyc lib/gobject-introspection/giscanner/dumper.pyo +lib/gobject-introspection/giscanner/gdumpparser.py +lib/gobject-introspection/giscanner/gdumpparser.pyc +lib/gobject-introspection/giscanner/gdumpparser.pyo lib/gobject-introspection/giscanner/girparser.py lib/gobject-introspection/giscanner/girparser.pyc lib/gobject-introspection/giscanner/girparser.pyo lib/gobject-introspection/giscanner/girwriter.py lib/gobject-introspection/giscanner/girwriter.pyc lib/gobject-introspection/giscanner/girwriter.pyo -lib/gobject-introspection/giscanner/glibast.py -lib/gobject-introspection/giscanner/glibast.pyc -lib/gobject-introspection/giscanner/glibast.pyo -lib/gobject-introspection/giscanner/glibtransformer.py -lib/gobject-introspection/giscanner/glibtransformer.pyc -lib/gobject-introspection/giscanner/glibtransformer.pyo +lib/gobject-introspection/giscanner/introspectablepass.py +lib/gobject-introspection/giscanner/introspectablepass.pyc +lib/gobject-introspection/giscanner/introspectablepass.pyo lib/gobject-introspection/giscanner/libtoolimporter.py lib/gobject-introspection/giscanner/libtoolimporter.pyc lib/gobject-introspection/giscanner/libtoolimporter.pyo -lib/gobject-introspection/giscanner/minixpath.py -lib/gobject-introspection/giscanner/minixpath.pyc -lib/gobject-introspection/giscanner/minixpath.pyo +lib/gobject-introspection/giscanner/maintransformer.py +lib/gobject-introspection/giscanner/maintransformer.pyc +lib/gobject-introspection/giscanner/maintransformer.pyo +lib/gobject-introspection/giscanner/message.py +lib/gobject-introspection/giscanner/message.pyc +lib/gobject-introspection/giscanner/message.pyo lib/gobject-introspection/giscanner/odict.py lib/gobject-introspection/giscanner/odict.pyc lib/gobject-introspection/giscanner/odict.pyo @@ -74,6 +99,9 @@ lib/gobject-introspection/giscanner/shlibs.pyo lib/gobject-introspection/giscanner/sourcescanner.py lib/gobject-introspection/giscanner/sourcescanner.pyc lib/gobject-introspection/giscanner/sourcescanner.pyo +lib/gobject-introspection/giscanner/testcodegen.py +lib/gobject-introspection/giscanner/testcodegen.pyc +lib/gobject-introspection/giscanner/testcodegen.pyo lib/gobject-introspection/giscanner/transformer.py lib/gobject-introspection/giscanner/transformer.pyc lib/gobject-introspection/giscanner/transformer.pyo @@ -86,20 +114,12 @@ lib/gobject-introspection/giscanner/xmlwriter.pyo lib/libgirepository-1.0.a lib/libgirepository-1.0.la lib/libgirepository-1.0.so -lib/libgirepository-1.0.so.0 -lib/libgirepository-everything-1.0.a -lib/libgirepository-everything-1.0.la -lib/libgirepository-everything-1.0.so -lib/libgirepository-everything-1.0.so.1 -lib/libgirepository-gimarshallingtests-1.0.a -lib/libgirepository-gimarshallingtests-1.0.la -lib/libgirepository-gimarshallingtests-1.0.so -lib/libgirepository-gimarshallingtests-1.0.so.1 +lib/libgirepository-1.0.so.1 libdata/pkgconfig/gobject-introspection-1.0.pc libdata/pkgconfig/gobject-introspection-no-export-1.0.pc share/aclocal/introspection.m4 -share/gir-1.0/Everything-1.0.gir -share/gir-1.0/GIMarshallingTests-1.0.gir +share/gir-1.0/DBus-1.0.gir +share/gir-1.0/DBusGLib-1.0.gir share/gir-1.0/GIRepository-2.0.gir share/gir-1.0/GL-1.0.gir share/gir-1.0/GLib-2.0.gir @@ -115,9 +135,61 @@ share/gir-1.0/xft-2.0.gir share/gir-1.0/xlib-2.0.gir share/gir-1.0/xrandr-1.3.gir share/gobject-introspection-1.0/Makefile.introspection +share/gobject-introspection-1.0/gdump.c +share/gobject-introspection-1.0/tests/everything.c +share/gobject-introspection-1.0/tests/everything.h +share/gobject-introspection-1.0/tests/gimarshallingtests.c +share/gobject-introspection-1.0/tests/gimarshallingtests.h +share/gobject-introspection-1.0/tests/regress.c +share/gobject-introspection-1.0/tests/regress.h +share/gtk-doc/html/gi/annotation-glossary.html +share/gtk-doc/html/gi/gi-GIArgInfo.html +share/gtk-doc/html/gi/gi-GIBaseInfo.html +share/gtk-doc/html/gi/gi-GICallableInfo.html +share/gtk-doc/html/gi/gi-GIConstantInfo.html +share/gtk-doc/html/gi/gi-GIEnumInfo.html +share/gtk-doc/html/gi/gi-GIErrorDomainInfo.html +share/gtk-doc/html/gi/gi-GIFieldInfo.html +share/gtk-doc/html/gi/gi-GIFunctionInfo.html +share/gtk-doc/html/gi/gi-GIInterfaceInfo.html +share/gtk-doc/html/gi/gi-GIObjectInfo.html +share/gtk-doc/html/gi/gi-GIPropertyInfo.html +share/gtk-doc/html/gi/gi-GIRegisteredTypeInfo.html +share/gtk-doc/html/gi/gi-GISignalInfo.html +share/gtk-doc/html/gi/gi-GIStructInfo.html +share/gtk-doc/html/gi/gi-GITypeInfo.html +share/gtk-doc/html/gi/gi-GIUnionInfo.html +share/gtk-doc/html/gi/gi-GIVFuncInfo.html +share/gtk-doc/html/gi/gi-ffi.html +share/gtk-doc/html/gi/gi-gir-reference.html +share/gtk-doc/html/gi/gi-gir.html +share/gtk-doc/html/gi/gi-girepository.html +share/gtk-doc/html/gi/gi-girffi.html +share/gtk-doc/html/gi/gi-gtypelib.html +share/gtk-doc/html/gi/gi-libgirepository.html +share/gtk-doc/html/gi/gi-overview.html +share/gtk-doc/html/gi/gi-repository-structs.html +share/gtk-doc/html/gi/gi-struct-hierarchy.html +share/gtk-doc/html/gi/gi-typelib.html +share/gtk-doc/html/gi/gi.devhelp +share/gtk-doc/html/gi/gi.devhelp2 +share/gtk-doc/html/gi/girepository.html +share/gtk-doc/html/gi/glib.html +share/gtk-doc/html/gi/home.png +share/gtk-doc/html/gi/index.html +share/gtk-doc/html/gi/index.sgml +share/gtk-doc/html/gi/left.png +share/gtk-doc/html/gi/overview.png +share/gtk-doc/html/gi/right.png +share/gtk-doc/html/gi/style.css +share/gtk-doc/html/gi/up.png +@dirrm share/gtk-doc/html/gi +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc +@dirrm share/gobject-introspection-1.0/tests @dirrm share/gobject-introspection-1.0 -@dirrm include/gobject-introspection-1.0 +@dirrmtry share/gir-1.0 @dirrmtry lib/girepository-1.0 @dirrm lib/gobject-introspection/giscanner @dirrm lib/gobject-introspection -@dirrmtry share/gir-1.0 +@dirrm include/gobject-introspection-1.0 diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index bb6e05d5bd34..50423b59ed44 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/devel/gvfs/Makefile,v 1.4 2010/07/13 12:41:36 kwm Exp $ +# $MCom: ports/devel/gvfs/Makefile,v 1.66 2010/11/13 01:48:28 kwm Exp $ # PORTNAME= gvfs -PORTVERSION= 1.6.3 -PORTREVISION= 1 +PORTVERSION= 1.6.6 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +17,7 @@ COMMENT= GNOME virtual file system LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \ hal.1:${PORTSDIR}/sysutils/hal \ - soup-2.4.1:${PORTSDIR}/devel/libsoup \ + soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \ gnome-keyring:${PORTSDIR}/security/gnome-keyring \ avahi-client.3:${PORTSDIR}/net/avahi-app RUN_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo index 74af4a70b7f5..5cd6abd7ebc4 100644 --- a/devel/gvfs/distinfo +++ b/devel/gvfs/distinfo @@ -1,3 +1,2 @@ -MD5 (gnome2/gvfs-1.6.3.tar.bz2) = 1c2e76b6c7c7ed603bab05753f971f82 -SHA256 (gnome2/gvfs-1.6.3.tar.bz2) = 4e3fe2dd80e5baaf4c1844560f6a787b144a917de1cb457b41efcb338477e760 -SIZE (gnome2/gvfs-1.6.3.tar.bz2) = 1347090 +SHA256 (gnome2/gvfs-1.6.6.tar.bz2) = 902890deb6a670f642180ea958406ebb02af1d5867a464c87e493d56f1dde7bd +SIZE (gnome2/gvfs-1.6.6.tar.bz2) = 1387796 diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist index 045d2c2b0c27..353491c5fe39 100644 --- a/devel/gvfs/pkg-plist +++ b/devel/gvfs/pkg-plist @@ -72,6 +72,7 @@ share/gvfs/mounts/sftp.mount share/gvfs/mounts/trash.mount %%GPHOTO2%%share/gvfs/remote-volume-monitors/gphoto2.monitor share/gvfs/remote-volume-monitors/hal.monitor +share/locale/af/LC_MESSAGES/gvfs.mo share/locale/ar/LC_MESSAGES/gvfs.mo share/locale/as/LC_MESSAGES/gvfs.mo share/locale/ast/LC_MESSAGES/gvfs.mo @@ -132,6 +133,7 @@ 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/ug/LC_MESSAGES/gvfs.mo share/locale/uk/LC_MESSAGES/gvfs.mo share/locale/vi/LC_MESSAGES/gvfs.mo share/locale/zh_CN/LC_MESSAGES/gvfs.mo @@ -145,6 +147,8 @@ 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/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile index f086065352e6..2eda5da51dbc 100644 --- a/devel/json-glib/Makefile +++ b/devel/json-glib/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/json-glib/Makefile,v 1.8 2010/03/20 01:19:18 marcus Exp $ +# $MCom: ports/devel/json-glib/Makefile,v 1.12 2010/09/25 15:34:43 kwm Exp $ # PORTNAME= json-glib -PORTVERSION= 0.10.4 +PORTVERSION= 0.12.0 CATEGORIES= devel MASTER_SITES= GNOME diff --git a/devel/json-glib/distinfo b/devel/json-glib/distinfo index 3cea6fe6f6d9..2bd6ad898430 100644 --- a/devel/json-glib/distinfo +++ b/devel/json-glib/distinfo @@ -1,3 +1,3 @@ -MD5 (json-glib-0.10.4.tar.bz2) = cb207a673438d1bc833eca6fc93f80e1 -SHA256 (json-glib-0.10.4.tar.bz2) = efd8b341d3f9e03cc35b7e2eb353b8336cf7a5560ad273b07e85f7a7a46d5ed9 -SIZE (json-glib-0.10.4.tar.bz2) = 389457 +MD5 (json-glib-0.12.0.tar.bz2) = ee611ef8d7b6e67a14021b32d66b7d1a +SHA256 (json-glib-0.12.0.tar.bz2) = e22978aadbe92a12e4cef2f494eb3571ac5c983ad05cff4256328157f1112842 +SIZE (json-glib-0.12.0.tar.bz2) = 417623 diff --git a/devel/json-glib/pkg-plist b/devel/json-glib/pkg-plist index 40f6fcd59311..4a0bcfbde4f7 100644 --- a/devel/json-glib/pkg-plist +++ b/devel/json-glib/pkg-plist @@ -1,8 +1,10 @@ +include/json-glib-1.0/json-glib/json-builder.h include/json-glib-1.0/json-glib/json-enum-types.h include/json-glib-1.0/json-glib/json-generator.h include/json-glib-1.0/json-glib/json-glib.h include/json-glib-1.0/json-glib/json-gobject.h include/json-glib-1.0/json-glib/json-parser.h +include/json-glib-1.0/json-glib/json-reader.h include/json-glib-1.0/json-glib/json-types.h include/json-glib-1.0/json-glib/json-version.h lib/girepository-1.0/Json-1.0.typelib @@ -11,8 +13,10 @@ lib/libjson-glib-1.0.la lib/libjson-glib-1.0.so lib/libjson-glib-1.0.so.0 libdata/pkgconfig/json-glib-1.0.pc +%%DOCSDIR%%/JsonBuilder.html %%DOCSDIR%%/JsonGenerator.html %%DOCSDIR%%/JsonParser.html +%%DOCSDIR%%/JsonReader.html %%DOCSDIR%%/annotation-glossary.html %%DOCSDIR%%/ch01.html %%DOCSDIR%%/ch02.html @@ -27,6 +31,7 @@ libdata/pkgconfig/json-glib-1.0.pc %%DOCSDIR%%/ix04.html %%DOCSDIR%%/ix05.html %%DOCSDIR%%/ix06.html +%%DOCSDIR%%/ix07.html %%DOCSDIR%%/json-advanced.html %%DOCSDIR%%/json-base.html %%DOCSDIR%%/json-glib-Boxed-Types-Serialization.html diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 2c38fdc5873c..e89182d4ff92 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.81 2010/04/02 18:10:40 kwm Exp $ +# $MCom: ports/devel/libbonobo/Makefile,v 1.84 2010/09/26 20:57:33 kwm Exp $ # PORTNAME= libbonobo -PORTVERSION= 2.24.3 -PORTREVISION?= 1 +PORTVERSION= 2.32.0 +PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,8 +20,7 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_GMAKE= yes USE_BISON= build diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index dbbb5091b584..5c05f1acd8dd 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libbonobo-2.24.3.tar.bz2) = b217cef6a187505290c66c5bf8225d38 -SHA256 (gnome2/libbonobo-2.24.3.tar.bz2) = 5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe -SIZE (gnome2/libbonobo-2.24.3.tar.bz2) = 1354929 +MD5 (gnome2/libbonobo-2.32.0.tar.bz2) = bc2b25b03ca57866a61e04852f2f53fd +SHA256 (gnome2/libbonobo-2.32.0.tar.bz2) = b8b8037d5e8e37f39395a2a2fba7f2fb3d5b53ecedc3d419181912b831ab1349 +SIZE (gnome2/libbonobo-2.32.0.tar.bz2) = 1373333 diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index 161fb13c9378..9ac24260a1ba 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -131,6 +131,7 @@ share/locale/he/LC_MESSAGES/libbonobo-2.0.mo share/locale/hi/LC_MESSAGES/libbonobo-2.0.mo share/locale/hr/LC_MESSAGES/libbonobo-2.0.mo share/locale/hu/LC_MESSAGES/libbonobo-2.0.mo +share/locale/hy/LC_MESSAGES/libbonobo-2.0.mo share/locale/id/LC_MESSAGES/libbonobo-2.0.mo share/locale/is/LC_MESSAGES/libbonobo-2.0.mo share/locale/it/LC_MESSAGES/libbonobo-2.0.mo @@ -215,6 +216,8 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy @dirrmtry share/locale/en@shaw/LC_MESSAGES @dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile index fe6801374d4b..40e5358b29c5 100644 --- a/devel/libgdata/Makefile +++ b/devel/libgdata/Makefile @@ -3,22 +3,19 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgdata/Makefile,v 1.9 2010/03/30 11:24:13 kwm Exp $ +# $MCom: ports/devel/libgdata/Makefile,v 1.14 2010/09/30 19:39:17 kwm Exp $ # PORTNAME= libgdata -PORTVERSION= 0.6.4 -PORTREVISION= 1 +PORTVERSION= 0.6.5 CATEGORIES= devel MASTER_SITES= GNOME MAINTAINER= kwm@FreeBSD.org COMMENT= GLib based implimentation of the GData protocol -BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup \ - g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup -RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS= soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome USE_BZIP2= yes USE_LDCONFIG= yes diff --git a/devel/libgdata/distinfo b/devel/libgdata/distinfo index 49d1b0deb532..687fe9bbabde 100644 --- a/devel/libgdata/distinfo +++ b/devel/libgdata/distinfo @@ -1,3 +1,3 @@ -MD5 (libgdata-0.6.4.tar.bz2) = 7efdef75d1b59177d119f689522d00ba -SHA256 (libgdata-0.6.4.tar.bz2) = 56c3f3cbd0bf8c410ebdff2d8a57eeb1db7dbc1bb342bf6f43f89700ef517d9d -SIZE (libgdata-0.6.4.tar.bz2) = 1003963 +MD5 (libgdata-0.6.5.tar.bz2) = e12f52a3d25c25016856c64ca0331221 +SHA256 (libgdata-0.6.5.tar.bz2) = dcb82f7162d69549512444376da2cdea65650ee4dae4d00eed7fbbd3387ddf2c +SIZE (libgdata-0.6.5.tar.bz2) = 1015870 diff --git a/devel/libgdata/pkg-plist b/devel/libgdata/pkg-plist index 6ebbc629022c..6469866830a5 100644 --- a/devel/libgdata/pkg-plist +++ b/devel/libgdata/pkg-plist @@ -119,6 +119,8 @@ share/doc/gdata/GDataYouTubeQuery.html share/doc/gdata/GDataYouTubeService.html share/doc/gdata/GDataYouTubeState.html share/doc/gdata/GDataYouTubeVideo.html +share/doc/gdata/annotation-glossary.html +share/doc/gdata/api-index-deprecated.html share/doc/gdata/api-index-full.html share/doc/gdata/ch01.html share/doc/gdata/ch02.html @@ -140,7 +142,6 @@ share/doc/gdata/gdata.devhelp2 share/doc/gdata/home.png share/doc/gdata/index.html share/doc/gdata/index.sgml -share/doc/gdata/ix02.html share/doc/gdata/ix03.html share/doc/gdata/ix04.html share/doc/gdata/ix05.html @@ -148,6 +149,7 @@ share/doc/gdata/ix06.html share/doc/gdata/ix07.html share/doc/gdata/ix08.html share/doc/gdata/ix09.html +share/doc/gdata/ix10.html share/doc/gdata/left.png share/doc/gdata/pt01.html share/doc/gdata/pt02.html diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile index 59d6f00671d0..d53acadf7c5c 100644 --- a/devel/libgee/Makefile +++ b/devel/libgee/Makefile @@ -6,14 +6,18 @@ # PORTNAME= libgee -PORTVERSION= 0.5.0 +PORTVERSION= 0.6.0 CATEGORIES= devel -MASTER_SITES= GNOME/sources/${PORTNAME}/0.5/ +MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:R}/ MAINTAINER= kwm@FreeBSD.org COMMENT= GObject collection library +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection + GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-introspection=yes +USE_BZIP2= yes USE_GNOME= glib20 gnomehack USE_LDCONFIG= yes diff --git a/devel/libgee/distinfo b/devel/libgee/distinfo index fe5c9d85345b..24d9fd7f55e4 100644 --- a/devel/libgee/distinfo +++ b/devel/libgee/distinfo @@ -1,3 +1,3 @@ -MD5 (libgee-0.5.0.tar.gz) = e344c13851e991dd24b4e9ebbc3f8fb7 -SHA256 (libgee-0.5.0.tar.gz) = 5986ac76c78a5da4800916dbe477ab8196ee86f6777d638060ccded248cb38be -SIZE (libgee-0.5.0.tar.gz) = 675954 +MD5 (libgee-0.6.0.tar.bz2) = 4eb513b23ab6ea78884989518a4acf6f +SHA256 (libgee-0.6.0.tar.bz2) = e586678d0a88637abeaaf850b62231000772e79ea6d9c4b45dc3cea99f778a7a +SIZE (libgee-0.6.0.tar.bz2) = 477609 diff --git a/devel/libgee/files/patch-gee_Makefile.in b/devel/libgee/files/patch-gee_Makefile.in new file mode 100644 index 000000000000..6a506df72736 --- /dev/null +++ b/devel/libgee/files/patch-gee_Makefile.in @@ -0,0 +1,11 @@ +--- gee/Makefile.in.orig 2010-08-08 13:36:58.000000000 +0200 ++++ gee/Makefile.in 2010-08-08 13:37:42.000000000 +0200 +@@ -872,7 +872,7 @@ + touch $@ + + @HAVE_INTROSPECTION_TRUE@Gee-1.0.typelib: Gee-1.0.gir +-@HAVE_INTROSPECTION_TRUE@ @INTROSPECTION_COMPILER@ --shared-library=libgee -o $@ $^ ++@HAVE_INTROSPECTION_TRUE@ @INTROSPECTION_COMPILER@ --shared-library=libgee Gee-1.0.gir -o $@ $^ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/devel/libgee/pkg-plist b/devel/libgee/pkg-plist index 8d0569d9059f..970a894ce808 100644 --- a/devel/libgee/pkg-plist +++ b/devel/libgee/pkg-plist @@ -2,10 +2,12 @@ include/gee-1.0/gee.h lib/libgee.la lib/libgee.so lib/libgee.so.2 +lib/girepository-1.0/Gee-1.0.typelib libdata/pkgconfig/gee-1.0.pc share/gir-1.0/Gee-1.0.gir share/vala/vapi/gee-1.0.vapi @dirrm share/vala/vapi @dirrm share/vala -@dirrm share/gir-1.0 +@dirrmtry share/gir-1.0 +@dirrmtry lib/girepository-1.0 @dirrm include/gee-1.0 diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile index b678af304f23..56229781611e 100644 --- a/devel/libnotify/Makefile +++ b/devel/libnotify/Makefile @@ -3,26 +3,27 @@ # Whom: Andreas Kohn <andreas@syndrom23.de> # # $FreeBSD$ -# $MCom: ports/devel/libnotify/Makefile,v 1.3 2008/11/30 19:42:57 marcus Exp $ +# $MCom: ports/devel/libnotify/Makefile,v 1.10 2010/10/15 06:43:06 avl Exp $ # PORTNAME= libnotify -PORTVERSION= 0.4.5 -PORTREVISION= 4 +PORTVERSION= 0.5.2 CATEGORIES= devel gnome -MASTER_SITES= http://www.galago-project.org/files/releases/source/libnotify/ +MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= A library for desktop notifications LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING +USE_BZIP2= yes USE_GNOME= gnomehack gnometarget intlhack glib20 gtk20 ltverhack USE_GETTEXT= yes USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 -CONFIGURE_ARGS= --without-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/libnotify/distinfo b/devel/libnotify/distinfo index fa3d33aa8905..9e00644985d7 100644 --- a/devel/libnotify/distinfo +++ b/devel/libnotify/distinfo @@ -1,3 +1,3 @@ -MD5 (libnotify-0.4.5.tar.gz) = 472e2c1f808848365572a9b024d9e8f5 -SHA256 (libnotify-0.4.5.tar.gz) = 0799db8ea1500b65a477421a8c930cc8c8b0bbc0596e55ea1601e2542f3fb0d9 -SIZE (libnotify-0.4.5.tar.gz) = 364142 +MD5 (libnotify-0.5.2.tar.bz2) = 4361058ae4e28a9ffce6764e7d03acd1 +SHA256 (libnotify-0.5.2.tar.bz2) = 1f6f1a2d6a0e009997c7ed31f6197f9bf09e9b45fb9cd54acabceea951d99062 +SIZE (libnotify-0.5.2.tar.bz2) = 310439 diff --git a/devel/libnotify/pkg-plist b/devel/libnotify/pkg-plist index bc896db170d1..11162feb7453 100644 --- a/devel/libnotify/pkg-plist +++ b/devel/libnotify/pkg-plist @@ -1,18 +1,19 @@ bin/notify-send include/libnotify/notification.h include/libnotify/notify-enum-types.h +include/libnotify/notify-features.h include/libnotify/notify.h lib/libnotify.a lib/libnotify.la lib/libnotify.so lib/libnotify.so.1 libdata/pkgconfig/libnotify.pc -share/gtk-doc/html/libnotify/NotifyNotification.html share/gtk-doc/html/libnotify/ch01.html share/gtk-doc/html/libnotify/home.png share/gtk-doc/html/libnotify/index.html share/gtk-doc/html/libnotify/index.sgml share/gtk-doc/html/libnotify/left.png +share/gtk-doc/html/libnotify/libnotify-notification.html share/gtk-doc/html/libnotify/libnotify-notify.html share/gtk-doc/html/libnotify/libnotify.devhelp share/gtk-doc/html/libnotify/libnotify.devhelp2 diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile index 203ef854452d..acd86dde0833 100644 --- a/devel/liboobs/Makefile +++ b/devel/liboobs/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/liboobs/Makefile,v 1.46 2010/04/01 22:27:34 kwm Exp $ +# $MCom: ports/devel/liboobs/Makefile,v 1.50 2010/09/27 17:46:12 kwm Exp $ # PORTNAME= liboobs -PORTVERSION= 2.30.1 +PORTVERSION= 2.32.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/liboobs/distinfo b/devel/liboobs/distinfo index 24d3c9763842..8c1a60acaf44 100644 --- a/devel/liboobs/distinfo +++ b/devel/liboobs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/liboobs-2.30.1.tar.bz2) = 65abd1254c63aea04fc1879c21e0051d -SHA256 (gnome2/liboobs-2.30.1.tar.bz2) = 591c938ef000bcb5357cf9b8329c6783c5f2e8d71bbab81c1961d220ed246091 -SIZE (gnome2/liboobs-2.30.1.tar.bz2) = 369861 +MD5 (gnome2/liboobs-2.32.0.tar.bz2) = 0bb40041b7227f9060ab51f3022115df +SHA256 (gnome2/liboobs-2.32.0.tar.bz2) = 1b70061272b2c777d505b5b6c785e045d4297639dd0d4214d04dea154a9b63d6 +SIZE (gnome2/liboobs-2.32.0.tar.bz2) = 368347 diff --git a/devel/liboobs/pkg-plist b/devel/liboobs/pkg-plist index a790cf8b2ba5..82d80e062c20 100644 --- a/devel/liboobs/pkg-plist +++ b/devel/liboobs/pkg-plist @@ -33,7 +33,7 @@ include/liboobs-1.0/oobs/oobs.h lib/liboobs-1.a lib/liboobs-1.la lib/liboobs-1.so -lib/liboobs-1.so.4 +lib/liboobs-1.so.5 libdata/pkgconfig/liboobs-1.pc %%DOCSDIR%%/OobsGroup.html %%DOCSDIR%%/OobsGroupsConfig.html diff --git a/devel/libsoup-gnome/Makefile b/devel/libsoup-gnome/Makefile new file mode 100644 index 000000000000..fafcadceb911 --- /dev/null +++ b/devel/libsoup-gnome/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: libgsf +# Date created: 11 September 2002 +# Whom: Maxim Sobolev <sobomax@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/devel/libsoup-gnome/Makefile,v 1.1 2010/06/05 21:11:10 kwm Exp $ +# + +PORTREVISION= 0 +CATEGORIES= devel gnome +PKGNAMESUFFIX= -gnome + +MAINTAINER= gnome@FreeBSD.org +COMMENT= A GNOME wrapper for libsoup + +MASTERDIR= ${.CURDIR}/../libsoup +#BUILD_WRKSRC= ${WRKSRC}/gsf-gnome +#INSTALL_WRKSRC= ${WRKSRC}/gsf-gnome +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist + +SOUP_SLAVE= yes + +#post-install: +# @${MKDIR} ${PREFIX}/libdata/pkgconfig +# @${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-2.4.pc \ +# ${PREFIX}/libdata/pkgconfig/ + +.include "${MASTERDIR}/Makefile" diff --git a/devel/libsoup-gnome/pkg-descr b/devel/libsoup-gnome/pkg-descr new file mode 100644 index 000000000000..1ec2bfea440f --- /dev/null +++ b/devel/libsoup-gnome/pkg-descr @@ -0,0 +1,16 @@ +Soup is a SOAP (Simple Object Access Protocol) implementation in C. + +It provides a queued asynchronous callback-based mechanism for sending and +servicing SOAP requests, and a WSDL (Web Service Definition Language) for C +compilers which generates client stubs and server skeletons for easily +calling and implementing SOAP methods. It uses GLib and is designed to work +well with GTK applications. + +Features: + * Completely Asynchronous + * Connection cache + * HTTP chunked transfer and persistent connections + * Authenticated HTTP, SOCKS4, and SOCKS5 proxy support + * SSL Support using OpenSSL + * Apache module server support + * Client digest authentication diff --git a/devel/libsoup-gnome/pkg-plist b/devel/libsoup-gnome/pkg-plist new file mode 100644 index 000000000000..500adeb165e8 --- /dev/null +++ b/devel/libsoup-gnome/pkg-plist @@ -0,0 +1,10 @@ +include/libsoup-gnome-%%VERSION%%/libsoup/soup-cookie-jar-sqlite.h +include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome-features.h +include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome.h +lib/libsoup-gnome-%%VERSION%%.a +lib/libsoup-gnome-%%VERSION%%.la +lib/libsoup-gnome-%%VERSION%%.so +lib/libsoup-gnome-%%VERSION%%.so.1 +libdata/pkgconfig/libsoup-gnome-%%VERSION%%.pc +@dirrm include/libsoup-gnome-%%VERSION%%/libsoup +@dirrm include/libsoup-gnome-%%VERSION%% diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 991311495bc5..81bb2b1f9cfb 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/devel/libsoup/Makefile,v 1.12 2010/06/24 10:03:53 kwm Exp $ +# $MCom: ports/devel/libsoup/Makefile,v 1.90 2010/11/16 02:38:21 avl Exp $ # PORTNAME= libsoup -PORTVERSION= 2.30.2 -PORTREVISION?= 1 +PORTVERSION= 2.32.1 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,13 +20,7 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ - proxy.0:${PORTSDIR}/net/libproxy \ - gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \ - sqlite3.8:${PORTSDIR}/databases/sqlite3 - -USE_GETTEXT= yes -USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack gconf2 +USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes @@ -37,18 +31,30 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PLIST_SUB= VERSION="2.4" +.include <bsd.port.pre.mk> + +.if defined(SOUP_SLAVE) +LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup \ + proxy.0:${PORTSDIR}/net/libproxy \ + gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \ + sqlite3.8:${PORTSDIR}/databases/sqlite3 +CONFIGURE_ARGS+=--with-gnome +USE_GNOME+= gconf2 +.else +BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +CONFIGURE_ARGS+=--without-gnome +.endif + .if !defined(WITHOUT_SSL) LIB_DEPENDS+= gnutls.40:${PORTSDIR}/security/gnutls .else CONFIGURE_ARGS+=--disable-ssl .endif -.include <bsd.port.pre.mk> - pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "libsoup has the following configurable option(s):" - @${ECHO_MSG} " WITHOUT_SSL Disable GnuTLS SSL support" + @${ECHO_MSG} " WITHOUT_SSL Disable GnuTLS SSL support" @${ECHO_MSG} "" post-patch: @@ -56,9 +62,27 @@ post-patch: s|" == "|" = "|g' \ ${WRKSRC}/configure +.if defined(SOUP_SLAVE) +do-build: + cd ${WRKSRC}/libsoup && ${GMAKE} libsoup-gnome-2.4.la + +do-install: + ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.a ${PREFIX}/lib/ + ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.la ${PREFIX}/lib/ + ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so ${PREFIX}/lib/ + ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.1 ${PREFIX}/lib/ + cd ${WRKSRC}/libsoup && ${GMAKE} install-libsoupgnomeincludeHEADERS +.endif + post-install: +.if defined(SOUP_SLAVE) + @${MKDIR} ${PREFIX}/libdata/pkgconfig + @${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-2.4.pc \ + ${PREFIX}/libdata/pkgconfig/ +.else @${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \ ${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h +.endif .include <bsd.port.post.mk> diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index 44dad240d554..e27ede1ff2da 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,3 +1,2 @@ -MD5 (gnome2/libsoup-2.30.2.tar.bz2) = f33b62063e76a9b1d5503363a3ed6a84 -SHA256 (gnome2/libsoup-2.30.2.tar.bz2) = 78ccbce84fccc74a49fb8168eeb409a6429a8a5854f197261d4108b8bb106bf6 -SIZE (gnome2/libsoup-2.30.2.tar.bz2) = 644337 +SHA256 (gnome2/libsoup-2.32.1.tar.bz2) = 8779da1b4d85f443f04ea8301f52c4a1943c10e4dc8d20dbcdb3652921de6b8e +SIZE (gnome2/libsoup-2.32.1.tar.bz2) = 667140 diff --git a/devel/libsoup/files/patch-libsoup_Makefile.in b/devel/libsoup/files/patch-libsoup_Makefile.in new file mode 100644 index 000000000000..15a468ce49bc --- /dev/null +++ b/devel/libsoup/files/patch-libsoup_Makefile.in @@ -0,0 +1,19 @@ +--- libsoup/Makefile.in.orig 2010-05-14 16:28:56.000000000 +0200 ++++ libsoup/Makefile.in 2010-05-14 16:31:03.000000000 +0200 +@@ -112,7 +112,6 @@ + $(AM_CFLAGS) $(CFLAGS) $(libsoup_2_4_la_LDFLAGS) $(LDFLAGS) -o \ + $@ + @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_DEPENDENCIES = \ +-@BUILD_LIBSOUP_GNOME_TRUE@ libsoup-2.4.la $(am__DEPENDENCIES_1) \ + @BUILD_LIBSOUP_GNOME_TRUE@ $(am__DEPENDENCIES_1) \ + @BUILD_LIBSOUP_GNOME_TRUE@ $(am__DEPENDENCIES_1) \ + @BUILD_LIBSOUP_GNOME_TRUE@ $(am__DEPENDENCIES_1) \ +@@ -473,7 +472,7 @@ + + @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) + @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LIBADD = \ +-@BUILD_LIBSOUP_GNOME_TRUE@ libsoup-2.4.la \ ++@BUILD_LIBSOUP_GNOME_TRUE@ -lsoup-2.4 \ + @BUILD_LIBSOUP_GNOME_TRUE@ $(GLIB_LIBS) \ + @BUILD_LIBSOUP_GNOME_TRUE@ $(GCONF_LIBS) \ + @BUILD_LIBSOUP_GNOME_TRUE@ $(LIBPROXY_LIBS) \ diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index 2c2f61bacba1..ab9adb28206a 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -36,20 +36,14 @@ include/libsoup-%%VERSION%%/libsoup/soup-uri.h include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc.h include/libsoup-%%VERSION%%/libsoup/soup.h -include/libsoup-gnome-%%VERSION%%/libsoup/soup-cookie-jar-sqlite.h -include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome-features.h -include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome.h +lib/girepository-1.0/Soup-%%VERSION%%.typelib lib/libsoup-%%VERSION%%.a lib/libsoup-%%VERSION%%.la lib/libsoup-%%VERSION%%.so lib/libsoup-%%VERSION%%.so.1 -lib/libsoup-gnome-%%VERSION%%.a -lib/libsoup-gnome-%%VERSION%%.la -lib/libsoup-gnome-%%VERSION%%.so -lib/libsoup-gnome-%%VERSION%%.so.1 libdata/pkgconfig/libsoup-%%VERSION%%.pc -libdata/pkgconfig/libsoup-gnome-%%VERSION%%.pc -@dirrm include/libsoup-gnome-%%VERSION%%/libsoup -@dirrm include/libsoup-gnome-%%VERSION%% +share/gir-1.0/Soup-%%VERSION%%.gir @dirrm include/libsoup-%%VERSION%%/libsoup @dirrm include/libsoup-%%VERSION%% +@dirrmtry lib/girepository-1.0 +@dirrmtry share/gir-1.0 diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile index 5e4b420edc7a..8fb470dd5e62 100644 --- a/devel/monotone-viz/Makefile +++ b/devel/monotone-viz/Makefile @@ -21,6 +21,8 @@ RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz \ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN= Doesn't build with Glib-2.26 + USE_GMAKE= yes USE_OCAML= yes GNU_CONFIGURE= yes diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile index e7dc28283112..656517a69abd 100644 --- a/devel/py-gobject/Makefile +++ b/devel/py-gobject/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/py-gobject/Makefile,v 1.37 2010/01/03 06:54:20 marcus Exp $ +# $MCom: ports/devel/py-gobject/Makefile,v 1.42 2010/09/27 18:04:22 kwm Exp $ # PORTNAME= gobject -PORTVERSION= 2.21.1 +PORTVERSION= 2.26.0 CATEGORIES= devel python MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -18,6 +18,13 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Python bindings for GObject +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ + ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo +RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ + ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo + +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack glib20 @@ -29,8 +36,17 @@ CONFIGURE_ARGS= --disable-docs CONFLICTS= py*-gtk-0* PLIST_SUB= PYTHON_VER="${PYTHON_VER}" +.include <bsd.port.pre.mk> + +.if exists(${LOCALBASE}/lib/libffi.so) +LIB_DEPENDS+= ffi.5:${PORTSDIR}/devel/libffi +CONFIGURE_ARGS+=--with-ffi +.else +CONFIGURE_ARGS+=--without-ffi +.endif + post-install: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ ${PREFIX}/share/pygobject/2.0/codegen -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo index 2c1792ed61e3..f1bb638ced33 100644 --- a/devel/py-gobject/distinfo +++ b/devel/py-gobject/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pygobject-2.21.1.tar.bz2) = c12eef0cd6725dc7245c3db78ef85d2d -SHA256 (gnome2/pygobject-2.21.1.tar.bz2) = e6ae6c70966899d2040c82ae4e1590cf941ebf121a3ec61e80bf517ce8d9be0a -SIZE (gnome2/pygobject-2.21.1.tar.bz2) = 681795 +MD5 (gnome2/pygobject-2.26.0.tar.bz2) = 7e3352c4b83ce8dc15290e86dd9c2be0 +SHA256 (gnome2/pygobject-2.26.0.tar.bz2) = 5554acff9c27b647144143b0459359864e4a6f2ff62c7ba21cf310ad755cf7c7 +SIZE (gnome2/pygobject-2.26.0.tar.bz2) = 808427 diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist index 67f431338713..b0230853e604 100644 --- a/devel/py-gobject/pkg-plist +++ b/devel/py-gobject/pkg-plist @@ -7,6 +7,43 @@ lib/libpyglib-2.0-python%%PYTHON_VER%%.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/gi/__init__.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/__init__.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/__init__.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/_gi.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/_gi.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/_gi_cairo.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/_gi_cairo.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/importer.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/importer.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/importer.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/module.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/module.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/module.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/GIMarshallingTests.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/GIMarshallingTests.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/GIMarshallingTests.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/GLib.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/GLib.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/GLib.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/Gdk.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/Gdk.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/Gdk.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/Gtk.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/Gtk.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/Gtk.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/__init__.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/__init__.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/__init__.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/keysyms.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/keysyms.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/keysyms.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/repository/__init__.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/repository/__init__.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/repository/__init__.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/types.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/types.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/types.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 @@ -145,6 +182,7 @@ share/pygobject/2.0/codegen/scmexpr.pyc share/pygobject/2.0/defs/gappinfo.override share/pygobject/2.0/defs/gapplaunchcontext.override share/pygobject/2.0/defs/gbufferedinputstream.override +share/pygobject/2.0/defs/gcancellable.override share/pygobject/2.0/defs/gdatainputstream.override share/pygobject/2.0/defs/gdrive.override share/pygobject/2.0/defs/gfile.override @@ -187,5 +225,8 @@ share/pygobject/xsl/ref-html-style.xsl @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/glib @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gio +@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gi/repository +@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides +@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gi @dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0 @dirrmtry include/pygtk-2.0 diff --git a/devel/seed/Makefile b/devel/seed/Makefile index 3a089cd989f6..d11060768b63 100644 --- a/devel/seed/Makefile +++ b/devel/seed/Makefile @@ -3,15 +3,14 @@ # Whom: Alexander Logvinov <avl@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/seed/Makefile,v 1.19 2010/05/08 17:04:45 marcus Exp $ +# $MCom: ports/devel/seed/Makefile,v 1.24 2010/09/19 15:06:42 kwm Exp $ # # NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release. # To do that, just replace imports.searchPaths with "." and ".." elements. # PORTNAME= seed -PORTVERSION= 2.30.0 -PORTREVISION= 2 +PORTVERSION= 2.31.91 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -22,7 +21,7 @@ COMMENT= GObject JavaScriptCore bridge BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-js-common.pc:${PORTSDIR}/devel/gnome-js-common LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \ webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \ - girepository-1.0.0:${PORTSDIR}/devel/gobject-introspection \ + girepository-1.0.1:${PORTSDIR}/devel/gobject-introspection \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ mpfr.4:${PORTSDIR}/math/mpfr @@ -36,7 +35,7 @@ USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+=--enable-gtk-doc=no +CONFIGURE_ARGS+=--enable-gtk-doc=no --with-webkit=1.0 MAN1= seed.1 @@ -45,6 +44,8 @@ MAN1= seed.1 post-patch: @${REINPLACE_CMD} -e 's|== x|= x|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-ldl||g' \ + ${WRKSRC}/libseed/Makefile.in @${REINPLACE_CMD} -e 's|reference||g' ${WRKSRC}/doc/Makefile.in # @${FIND} ${WRKSRC}/examples -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \ # 's|$$(datadir)/doc/seed/examples|${EXAMPLESDIR}|g' diff --git a/devel/seed/distinfo b/devel/seed/distinfo index 6bee1233b0cf..be392a77bdc2 100644 --- a/devel/seed/distinfo +++ b/devel/seed/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/seed-2.30.0.tar.bz2) = dd09d22c6a06b4bbef7320bb6a715c0f -SHA256 (gnome2/seed-2.30.0.tar.bz2) = 3b5e7babd1e14793829c9d521319cbf2af9a66bea604c5dc80a9885558f00361 -SIZE (gnome2/seed-2.30.0.tar.bz2) = 770032 +MD5 (gnome2/seed-2.31.91.tar.bz2) = 024aff0a69761f77bc346bbad1a2489b +SHA256 (gnome2/seed-2.31.91.tar.bz2) = 9e1da3adc6ed25b1778508ab67aecfe0923d1083f375b88137ea5f9ff57c22a3 +SIZE (gnome2/seed-2.31.91.tar.bz2) = 762875 diff --git a/devel/seed/pkg-plist b/devel/seed/pkg-plist index b91412a68d76..db20734ff130 100644 --- a/devel/seed/pkg-plist +++ b/devel/seed/pkg-plist @@ -6,6 +6,9 @@ lib/libseed.a lib/libseed.la lib/libseed.so lib/libseed.so.0 +lib/seed/libseed_DynamicObject.a +lib/seed/libseed_DynamicObject.la +lib/seed/libseed_DynamicObject.so lib/seed/libseed_cairo.a lib/seed/libseed_cairo.la lib/seed/libseed_cairo.so diff --git a/devel/upp/files/patch-uppsrc_ide_Makefile b/devel/upp/files/patch-uppsrc_ide_Makefile new file mode 100644 index 000000000000..cfb15fbb87fb --- /dev/null +++ b/devel/upp/files/patch-uppsrc_ide_Makefile @@ -0,0 +1,11 @@ +--- uppsrc/ide/Makefile.orig 2010-10-31 16:58:47.000000000 +0100 ++++ uppsrc/ide/Makefile 2010-10-31 16:59:18.000000000 +0100 +@@ -6,7 +6,7 @@ + UPPDIR1 = uppsrc/ + UPPOUT = out/ + +-CINC = -I$(UPPDIR1) -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0 ++CINC = -I$(UPPDIR1) -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I${LOCALBASE}/include/gdk-pixbuf-2.0 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0 + Macro = -DflagGUI -DflagGCC -DflagSHARED -Dflag$(HOSTTYPE) + CC ?= c++ + C_FLAGS = $(CC) -c -O2 -x c $(CFLAGS) diff --git a/devel/valide/Makefile b/devel/valide/Makefile index 67cacbab76b1..041193c05f5f 100644 --- a/devel/valide/Makefile +++ b/devel/valide/Makefile @@ -18,6 +18,8 @@ LIB_DEPENDS= gdl-1:${PORTSDIR}/x11-toolkits/gdl BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala RUN_DEPENDS= ${BUILD_DEPENDS} +BROKEN= Doesn't build with vala-0.10 + INSTALLS_ICONS= yes USE_GETTEXT= yes USE_GNOME= gtk20 gtksourceview2 |