aboutsummaryrefslogtreecommitdiffstats
path: root/graphics/atril
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2015-07-28 04:19:33 +0800
committerkwm <kwm@FreeBSD.org>2015-07-28 04:19:33 +0800
commitf3a030abc46a4b0256ee69dd4918b96f535a295d (patch)
tree0d276f72ec80621ae31f35239a1c27ae16c21bba /graphics/atril
parentc0e75495d2db694b13f48fd2ce73094f2affcc17 (diff)
downloadfreebsd-ports-gnome-f3a030abc46a4b0256ee69dd4918b96f535a295d.tar.gz
freebsd-ports-gnome-f3a030abc46a4b0256ee69dd4918b96f535a295d.tar.zst
freebsd-ports-gnome-f3a030abc46a4b0256ee69dd4918b96f535a295d.zip
Update MATE DE to 1.10.0.
This MATE is still build agains GTK+2. Sort USES here and there. Replace mate-dialogs with zenity and mate-calc with galculator. This update fixes the following PR's: PR: 193942, 191885 Submitted by: Gustau Perez <gustau.perez@gmail.com> via Gnome devel repo Obtained from: gnome devel repo.
Diffstat (limited to 'graphics/atril')
-rw-r--r--graphics/atril/Makefile14
-rw-r--r--graphics/atril/distinfo4
-rw-r--r--graphics/atril/files/patch-shell_ev-window.c50
-rw-r--r--graphics/atril/pkg-plist208
4 files changed, 218 insertions, 58 deletions
diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile
index 0edf4d2f7fdd..6e9f81a47b28 100644
--- a/graphics/atril/Makefile
+++ b/graphics/atril/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= atril
-PORTVERSION= 1.8.1
-PORTREVISION?= 6
+PORTVERSION= 1.10.1
+PORTREVISION?= 2
CATEGORIES= graphics print mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -29,7 +29,6 @@ USE_GNOME= cairo gtk20 intlhack libxml2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtk=2.0 \
- --disable-introspection \
--disable-static
INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include
@@ -45,8 +44,8 @@ USE_MATE+= desktop
GLIB_SCHEMAS= org.mate.Atril.gschema.xml
-OPTIONS_DEFINE= CAJA COMICS DJVU DVI KEYRING T1LIB XPS
-OPTIONS_DEFAULT=CAJA COMICS KEYRING XPS
+OPTIONS_DEFINE= CAJA COMICS DJVU DVI EPUB KEYRING T1LIB XPS
+OPTIONS_DEFAULT=CAJA COMICS EPUB KEYRING XPS
DVI_DESC= DVI viewer support
T1LIB_DESC= T1LIB for TYPE1 fonts to DVI (Enables DVI)
CAJA_DESC= Caja plugin
@@ -54,6 +53,7 @@ KEYRING_DESC= Keyring support
COMICS_DESC= Comic book archives support
DJVU_DESC= DJVU support
XPS_DESC= XPS support
+EPUB_DESC= Epub support
OPTIONS_SUB= yes
@@ -62,10 +62,12 @@ CAJA_USE= MATE=caja
DJVU_LIB_DEPENDS= libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
DJVU_CONFIGURE_ENABLE= djvu
COMICS_CONFIGURE_ENABLE= comics
-KEYRING_CONFIGURE_WITH= keyring
+KEYRING_CONFIGURE_ENABLE= keyring
KEYRING_LIB_DEPENDS= libsecret-1.so:${PORTSDIR}/security/libsecret
XPS_CONFIGURE_ENABLE= xps
XPS_LIB_DEPENDS= libgxps.so:${PORTSDIR}/graphics/libgxps
+EPUB_CONFIGURE_ENABLE= epub
+EPUB_LIB_DEPENDS= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
.include <bsd.port.options.mk>
diff --git a/graphics/atril/distinfo b/graphics/atril/distinfo
index e83ed4f20f6e..ce1d75fca998 100644
--- a/graphics/atril/distinfo
+++ b/graphics/atril/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/atril-1.8.1.tar.xz) = 036b6bdf9f9caa7468c0cfb680360420cf8477007a0a04dc3b5c50b163c0333f
-SIZE (mate/atril-1.8.1.tar.xz) = 1577776
+SHA256 (mate/atril-1.10.1.tar.xz) = 21037e7b55cb028ba7f52780c99df02f6b4b0b4d16ecad2231efd105452c4e6e
+SIZE (mate/atril-1.10.1.tar.xz) = 2182156
diff --git a/graphics/atril/files/patch-shell_ev-window.c b/graphics/atril/files/patch-shell_ev-window.c
deleted file mode 100644
index 34e0ce012962..000000000000
--- a/graphics/atril/files/patch-shell_ev-window.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- shell/ev-window.c.orig 2015-01-30 14:16:41 UTC
-+++ shell/ev-window.c
-@@ -422,12 +422,12 @@ ev_window_setup_action_sensitivity (EvWi
- if (has_document && !ev_print_operation_exists_for_document(document))
- ok_to_print = FALSE;
-
-- if (has_document &&
-+ if (has_document && ev_window->priv->lockdown_settings &&
- g_settings_get_boolean (ev_window->priv->lockdown_settings, MATE_LOCKDOWN_SAVE)) {
- ok_to_copy = FALSE;
- }
-
-- if (has_document &&
-+ if (has_document && ev_window->priv->lockdown_settings &&
- g_settings_get_boolean (ev_window->priv->lockdown_settings, MATE_LOCKDOWN_PRINT)) {
- ok_to_print = FALSE;
- }
-@@ -1375,12 +1375,14 @@ ev_window_setup_document (EvWindow *ev_w
- ev_window);
- }
-
-- if (!ev_window->priv->lockdown_settings)
-- ev_window->priv->lockdown_settings = g_settings_new (MATE_LOCKDOWN_SCHEMA);
-- g_signal_connect (ev_window->priv->lockdown_settings,
-- "changed",
-- G_CALLBACK (lockdown_changed),
-- ev_window);
-+ if (g_settings_schema_source_lookup(g_settings_schema_source_get_default(), MATE_LOCKDOWN_SCHEMA, FALSE) != NULL) {
-+ if (!ev_window->priv->lockdown_settings)
-+ ev_window->priv->lockdown_settings = g_settings_new (MATE_LOCKDOWN_SCHEMA);
-+ g_signal_connect (ev_window->priv->lockdown_settings,
-+ "changed",
-+ G_CALLBACK (lockdown_changed),
-+ ev_window);
-+ }
-
- ev_window_setup_action_sensitivity (ev_window);
-
-@@ -3330,6 +3332,11 @@ ev_window_print_range (EvWindow *ev_wind
-
- ev_print_operation_set_embed_page_setup (op, !g_settings_get_boolean (ev_window->priv->lockdown_settings,
- MATE_LOCKDOWN_PRINT_SETUP));
-+ if (ev_window->priv->lockdown_settings)
-+ ev_print_operation_set_embed_page_setup (op, !g_settings_get_boolean (ev_window->priv->lockdown_settings,
-+ MATE_LOCKDOWN_PRINT_SETUP));
-+ else
-+ ev_print_operation_set_embed_page_setup (op, TRUE);
-
- g_object_unref (print_settings);
- g_object_unref (print_page_setup);
diff --git a/graphics/atril/pkg-plist b/graphics/atril/pkg-plist
index 607799c72193..6c3f8386f8e2 100644
--- a/graphics/atril/pkg-plist
+++ b/graphics/atril/pkg-plist
@@ -48,12 +48,218 @@ include/atril/1.5.0/libview/ev-stock-icons.h
include/atril/1.5.0/libview/ev-view-presentation.h
include/atril/1.5.0/libview/ev-view-type-builtins.h
include/atril/1.5.0/libview/ev-view.h
+include/atril/1.5.0/libview/ev-web-view.h
%%COMICS%%lib/atril/3/backends/comicsdocument.atril-backend
%%DJVU%%lib/atril/3/backends/djvudocument.atril-backend
%%DVI%%lib/atril/3/backends/dvidocument.atril-backend
+%%EPUB%%lib/atril/3/backends/epub/MathJax/Images/CloseX-31.png
+%%EPUB%%lib/atril/3/backends/epub/MathJax/Images/MenuArrow-15.png
+%%EPUB%%lib/atril/3/backends/epub/MathJax/MathJax.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/config/Accessible-full.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/config/Accessible.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/config/Safe.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/config/TeX-AMS-MML_SVG-full.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/config/TeX-AMS-MML_SVG.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/config/local/local.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/FontWarnings.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/HelpDialog.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/MatchWebFonts.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/MathEvents.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/MathML/content-mathml.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/MathMenu.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/MathZoom.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/Safe.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/AMScd.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/AMSmath.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/AMSsymbols.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/HTML.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/action.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/autobold.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/autoload-all.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/bbox.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/begingroup.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/boldsymbol.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/cancel.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/color.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/enclose.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/extpfeil.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/mathchoice.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/mhchem.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/newcommand.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/noErrors.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/noUndefined.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/unicode.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/TeX/verb.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/asciimath2jax.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/jsMath2jax.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/mml2jax.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/tex2jax.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/extensions/toMathML.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/jax.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/Arrows.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/BasicLatin.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/CombDiacritMarks.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/CombDiactForSymbols.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/Dingbats.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/GeneralPunctuation.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/GeometricShapes.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/GreekAndCoptic.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/Latin1Supplement.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/LetterlikeSymbols.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/MathOperators.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/MiscMathSymbolsA.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/MiscMathSymbolsB.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/MiscSymbolsAndArrows.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/MiscTechnical.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/SpacingModLetters.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/SuppMathOperators.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/SupplementalArrowsA.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/element/mml/optable/SupplementalArrowsB.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/AsciiMath/config.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/AsciiMath/jax.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/config.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/a.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/b.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/c.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/d.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/e.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/f.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/fr.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/g.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/h.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/i.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/j.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/k.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/l.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/m.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/n.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/o.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/opf.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/p.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/q.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/r.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/s.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/scr.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/t.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/u.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/v.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/w.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/x.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/y.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/entities/z.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/MathML/jax.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/TeX/config.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/input/TeX/jax.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/autoload/annotation-xml.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/autoload/maction.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/autoload/menclose.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/autoload/mglyph.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/autoload/mmultiscripts.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/autoload/ms.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/autoload/mtable.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/autoload/multiline.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/config.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/Arrows.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/BoxDrawing.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/CombDiacritMarks.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/Dingbats.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/EnclosedAlphanum.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/GeneralPunctuation.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/GeometricShapes.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/GreekAndCoptic.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/Latin1Supplement.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/LatinExtendedA.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/LetterlikeSymbols.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/MathOperators.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/MiscMathSymbolsB.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/MiscSymbols.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/MiscTechnical.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/PUA.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/SpacingModLetters.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/SuppMathOperators.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Caligraphic/Bold/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Caligraphic/Regular/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/BasicLatin.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/Other.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/PUA.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/BasicLatin.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/Other.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/PUA.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/Arrows.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/BasicLatin.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/CombDiacritMarks.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/CombDiactForSymbols.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/GeneralPunctuation.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/GeometricShapes.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/GreekAndCoptic.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/Latin1Supplement.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/LatinExtendedA.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/LatinExtendedB.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/LetterlikeSymbols.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/MathOperators.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/MiscMathSymbolsA.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/MiscSymbols.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/MiscTechnical.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/SpacingModLetters.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/SuppMathOperators.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/SupplementalArrowsA.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/BasicLatin.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/CombDiacritMarks.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/GeneralPunctuation.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/GreekAndCoptic.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/LatinExtendedA.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/LatinExtendedB.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/LetterlikeSymbols.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/MathOperators.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/BasicLatin.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/CombDiacritMarks.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/GeometricShapes.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/GreekAndCoptic.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/LatinExtendedA.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/LatinExtendedB.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/LetterlikeSymbols.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/MathOperators.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/MiscSymbols.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/SpacingModLetters.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/SuppMathOperators.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Math/BoldItalic/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Math/Italic/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/BasicLatin.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/CombDiacritMarks.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/Other.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Italic/BasicLatin.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Italic/CombDiacritMarks.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Italic/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Italic/Other.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Regular/BasicLatin.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Regular/CombDiacritMarks.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Regular/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Regular/Other.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Script/Regular/BasicLatin.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Script/Regular/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Size1/Regular/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Size2/Regular/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Size3/Regular/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Size4/Regular/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Typewriter/Regular/BasicLatin.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Main.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Other.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/fontdata-extra.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/fonts/TeX/fontdata.js
+%%EPUB%%lib/atril/3/backends/epub/MathJax/jax/output/SVG/jax.js
+%%EPUB%%lib/atril/3/backends/epubdocument.atril-backend
%%COMICS%%lib/atril/3/backends/libcomicsdocument.so
%%DJVU%%lib/atril/3/backends/libdjvudocument.so
%%DVI%%lib/atril/3/backends/libdvidocument.so
+%%EPUB%%lib/atril/3/backends/libepubdocument.so
lib/atril/3/backends/libpdfdocument.so
lib/atril/3/backends/libpsdocument.so
lib/atril/3/backends/libtiffdocument.so
@@ -77,6 +283,7 @@ man/man1/atril-previewer.1.gz
man/man1/atril-thumbnailer.1.gz
man/man1/atril.1.gz
share/MateConf/gsettings/atril.convert
+share/appdata/atril.appdata.xml
share/applications/atril.desktop
%%DATADIR%%/atril-previewer-ui.xml
%%DATADIR%%/atril-toolbar.xml
@@ -121,6 +328,7 @@ share/applications/atril.desktop
%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-left.svg
%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-right.svg
%%DATADIR%%/icons/hicolor/scalable/mimetypes/x-office-presentation.svg
+%%CAJA%%share/caja/extensions/libatril-properties-page.caja-extension
share/dbus-1/services/org.mate.atril.Daemon.service
share/gtk-doc/html/atril/EggFindBar.html
share/gtk-doc/html/atril/EvFileMonitor.html
generated by cgit (git 2.34.1) at 2025-02-19 06:29:09 +0800
'del'>databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c20
-rw-r--r--databases/libgda2/files/patch-providers_xml_gda-xml-provider.c11
-rw-r--r--databases/libgda2/pkg-plist257
-rw-r--r--databases/libgda3/Makefile21
-rw-r--r--databases/libgda3/distinfo4
-rw-r--r--databases/libgda3/files/patch-doc::libgda-C.omf.in8
-rw-r--r--databases/libgda3/files/patch-doc_C_Makefile.in18
-rw-r--r--databases/libgda3/files/patch-libgda_gda-util.c11
-rw-r--r--databases/libgda3/files/patch-ltmain.sh51
-rw-r--r--databases/libgda3/files/patch-po_Makefile.in.in10
-rw-r--r--databases/libgda3/files/patch-providers_ldap_gda-ldap-provider.c20
-rw-r--r--databases/libgda3/files/patch-providers_mdb_gda-mdb-provider.c20
-rw-r--r--databases/libgda3/files/patch-providers_mysql_gda-mysql-provider.c30
-rw-r--r--databases/libgda3/files/patch-providers_mysql_gda-mysql-recordset.c24
-rw-r--r--databases/libgda3/files/patch-providers_oracle_utils.c11
-rw-r--r--databases/libgda3/files/patch-providers_sqlite_gda-sqlite-provider.c20
-rw-r--r--databases/libgda3/files/patch-providers_xml_gda-xml-provider.c11
-rw-r--r--databases/libgda3/pkg-plist257
-rw-r--r--databases/libgnomedb/Makefile9
-rw-r--r--databases/libgnomedb/distinfo4
-rw-r--r--databases/libgnomedb/files/patch-Makefile.in16
-rw-r--r--databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-source-selector.c37
-rw-r--r--databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c16
-rw-r--r--databases/libgnomedb/files/patch-libgnomedb_gnome-db-form.c10
-rw-r--r--databases/libgnomedb/files/patch-libgnomedb_utils.c11
-rw-r--r--databases/libgnomedb/files/patch-po::Makefile.in.in10
-rw-r--r--databases/libgnomedb/pkg-plist180
-rw-r--r--databases/mergeant/Makefile13
-rw-r--r--databases/mergeant/distinfo4
-rw-r--r--databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in11
-rw-r--r--databases/mergeant/files/patch-lib_Makefile.in11
-rw-r--r--databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c17
-rw-r--r--databases/mergeant/files/patch-libmergeant_mg-form.c19
-rw-r--r--databases/mergeant/files/patch-libmergeant_mg-parameter.c13
-rw-r--r--databases/mergeant/files/patch-libmergeant_mg-query.c25
-rw-r--r--databases/mergeant/files/patch-libmergeant_mg-work-grid.c14
-rw-r--r--databases/mergeant/files/patch-src_Makefile.in11
-rw-r--r--databases/mergeant/files/patch-src_interface_cb.c10
-rw-r--r--databases/mergeant/files/patch-src_plugins_netaddr_makefile.in11
-rw-r--r--databases/mergeant/files/patch-src_plugins_picts_Makefile.in11
-rw-r--r--databases/mergeant/files/patch-src_plugins_sample_Makefile.in11
-rw-r--r--databases/mergeant/pkg-plist300
-rw-r--r--deskutils/gnome-utils/Makefile18
-rw-r--r--deskutils/gnome-utils/distinfo4
-rw-r--r--deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c29
-rw-r--r--deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-callbacks.c29
-rw-r--r--deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c10
-rw-r--r--deskutils/gnome-utils/files/patch-logview::log_repaint.c15
-rw-r--r--deskutils/gnome-utils/files/patch-logview::logrtns.h15
-rw-r--r--deskutils/gnome-utils/files/patch-logview_desc_db.c10
-rw-r--r--deskutils/gnome-utils/files/patch-logview_logview.c24
-rw-r--r--deskutils/gnome-utils/files/patch-logview_userprefs.c10
-rw-r--r--deskutils/gnome-utils/pkg-plist24
-rw-r--r--deskutils/gnomeutils2/Makefile18
-rw-r--r--deskutils/gnomeutils2/distinfo4
-rw-r--r--deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c29
-rw-r--r--deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-callbacks.c29
-rw-r--r--deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview::log_repaint.c15
-rw-r--r--deskutils/gnomeutils2/files/patch-logview::logrtns.h15
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_desc_db.c10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_logview.c24
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_userprefs.c10
-rw-r--r--deskutils/gnomeutils2/pkg-plist24
-rw-r--r--devel/bug-buddy/Makefile14
-rw-r--r--devel/bug-buddy/distinfo4
-rw-r--r--devel/bug-buddy/files/patch-docs_C_bug-buddy-C.omf12
-rw-r--r--devel/bug-buddy/files/patch-docs_bug-buddy.omf.in12
-rw-r--r--devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c10
-rw-r--r--devel/bug-buddy/pkg-plist3
-rw-r--r--devel/bugbuddy/Makefile14
-rw-r--r--devel/bugbuddy/distinfo4
-rw-r--r--devel/bugbuddy/files/patch-docs_C_bug-buddy-C.omf12
-rw-r--r--devel/bugbuddy/files/patch-docs_bug-buddy.omf.in12
-rw-r--r--devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c10
-rw-r--r--devel/bugbuddy/pkg-plist3
-rw-r--r--devel/gconf2/Makefile7
-rw-r--r--devel/gconf2/distinfo4
-rw-r--r--devel/gconf2/pkg-plist2
-rw-r--r--devel/glib20/Makefile20
-rw-r--r--devel/glib20/distinfo4
-rw-r--r--devel/glib20/files/extra-patch-gthread_gthread-posix.c32
-rw-r--r--devel/glib20/files/patch-glib_gutils.c20
-rw-r--r--devel/glib20/files/patch-gthread_gthread-posix.c32
-rw-r--r--devel/glib20/pkg-plist18
-rw-r--r--devel/gnome-vfs/Makefile31
-rw-r--r--devel/gnome-vfs/distinfo4
-rw-r--r--devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in285
-rw-r--r--devel/gnome-vfs/files/patch-Makefile.in10
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c11
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c10
-rw-r--r--devel/gnome-vfs/files/patch-modules_smb-method.c11
-rw-r--r--devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c11
-rw-r--r--devel/gnome-vfs/pkg-plist25
-rw-r--r--devel/gnome-vfsmm/Makefile16
-rw-r--r--devel/gnome-vfsmm/distinfo4
-rw-r--r--devel/gnome-vfsmm/pkg-plist5
-rw-r--r--devel/gnome2-hacker-tools/Makefile2
-rw-r--r--devel/gnomevfs2/Makefile31
-rw-r--r--devel/gnomevfs2/distinfo4
-rw-r--r--devel/gnomevfs2/files/KDE.directory5
-rw-r--r--devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in285
-rw-r--r--devel/gnomevfs2/files/patch-Makefile.in10
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c11
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c10
-rw-r--r--devel/gnomevfs2/files/patch-modules_smb-method.c11
-rw-r--r--devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c11
-rw-r--r--devel/gnomevfs2/pkg-plist25
-rw-r--r--devel/libglade2/Makefile25
-rw-r--r--devel/libglade2/distinfo6
-rw-r--r--devel/libglade2/files/patch-ab6
-rw-r--r--devel/libglade2/pkg-plist2
-rw-r--r--devel/libgsf-gnome/Makefile1
-rw-r--r--devel/libgsf-gnome/pkg-plist2
-rw-r--r--devel/libgsf/Makefile4
-rw-r--r--devel/libgsf/distinfo4
-rw-r--r--devel/libgsf/pkg-plist5
-rw-r--r--devel/libgtop2/Makefile4
-rw-r--r--devel/libgtop2/distinfo4
-rw-r--r--devel/libgtop2/files/patch-ah63
-rw-r--r--devel/libgtop2/files/patch-lib::lib.pl62
-rw-r--r--devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c30
-rw-r--r--devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c48
-rw-r--r--devel/libgtop2/files/patch-sysdeps_common_fsusage.c14
-rw-r--r--devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in20
-rw-r--r--devel/libgtop2/pkg-plist10
-rw-r--r--editors/gedit/Makefile10
-rw-r--r--editors/gedit/distinfo4
-rw-r--r--editors/gedit/files/patch-plugins_spell_gedit-spell-checker.c13
-rw-r--r--editors/gedit/files/patch-plugins_taglist_gedit-taglist-plugin-parser.c18
-rw-r--r--editors/gedit/pkg-plist5
-rw-r--r--editors/gnome2-office/Makefile2
-rw-r--r--games/gnome-games-extra-data/Makefile4
-rw-r--r--games/gnome-games-extra-data/distinfo4
-rw-r--r--games/gnome-games-extra-data/pkg-plist12
-rw-r--r--games/gnome-games/Makefile25
-rw-r--r--games/gnome-games/distinfo4
-rw-r--r--games/gnome-games/files/patch-iagno_othello.c21
-rw-r--r--games/gnome-games/pkg-install2
-rw-r--r--games/gnome-games/pkg-plist130
-rw-r--r--games/gnomegames2-extra-data/Makefile4
-rw-r--r--games/gnomegames2-extra-data/distinfo4
-rw-r--r--games/gnomegames2-extra-data/pkg-plist12
-rw-r--r--games/gnomegames2/Makefile25
-rw-r--r--games/gnomegames2/distinfo4
-rw-r--r--games/gnomegames2/files/patch-iagno_othello.c21
-rw-r--r--games/gnomegames2/pkg-install2
-rw-r--r--games/gnomegames2/pkg-plist130
-rw-r--r--graphics/eog/Makefile7
-rw-r--r--graphics/eog/distinfo4
-rw-r--r--graphics/eog/pkg-plist7
-rw-r--r--graphics/gpdf/Makefile7
-rw-r--r--graphics/gpdf/distinfo4
-rw-r--r--graphics/gpdf/pkg-plist2
-rw-r--r--graphics/libgnomecanvas/Makefile4
-rw-r--r--graphics/libgnomecanvas/distinfo4
-rw-r--r--graphics/libgnomecanvas/pkg-plist64
-rw-r--r--graphics/librsvg2/Makefile31
-rw-r--r--graphics/librsvg2/distinfo4
-rw-r--r--graphics/librsvg2/files/extra-patch-Makefile.in10
-rw-r--r--graphics/librsvg2/files/patch-moz-plugin_Makefile.in22
-rw-r--r--graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c15
-rw-r--r--graphics/librsvg2/files/patch-rsvg-paint-server.c14
-rw-r--r--graphics/librsvg2/files/patch-rsvg-shapes.c14
-rw-r--r--graphics/librsvg2/pkg-plist3
-rw-r--r--mail/evolution-exchange/Makefile14
-rw-r--r--mail/evolution-exchange/distinfo4
-rw-r--r--mail/evolution-exchange/files/patch-storage_e-folder-exchange.c16
-rw-r--r--mail/evolution-exchange/pkg-plist40
-rw-r--r--mail/evolution/Makefile35
-rw-r--r--mail/evolution/distinfo4
-rw-r--r--mail/evolution/files/patch-camel::camel-store.h13
-rw-r--r--mail/evolution/files/patch-camel_Makefile.in11
-rw-r--r--mail/evolution/files/patch-camel_camel-mime-utils.c11
-rw-r--r--mail/evolution/files/patch-mail_em-migrate.c11
-rw-r--r--mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c14
-rw-r--r--mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c19
-rw-r--r--mail/evolution/pkg-plist328
-rw-r--r--mail/ximian-connector/Makefile14
-rw-r--r--mail/ximian-connector/distinfo4
-rw-r--r--mail/ximian-connector/files/patch-storage_e-folder-exchange.c16
-rw-r--r--mail/ximian-connector/pkg-plist40
-rw-r--r--math/gcalctool/Makefile4
-rw-r--r--math/gcalctool/distinfo4
-rw-r--r--math/gcalctool/files/patch-gcalctool_functions.c19
-rw-r--r--math/gcalctool/pkg-plist6
-rw-r--r--misc/gnome-icon-theme/Makefile5
-rw-r--r--misc/gnome-icon-theme/distinfo4
-rw-r--r--misc/gnome-icon-theme/pkg-plist288
-rw-r--r--misc/gnomehier/Makefile44
-rw-r--r--misc/gnomehier/files/pkg-install.in8
-rw-r--r--multimedia/nautilus-media/Makefile31
-rw-r--r--multimedia/nautilus-media/distinfo2
-rw-r--r--multimedia/nautilus-media/pkg-descr2
-rw-r--r--multimedia/nautilus-media/pkg-plist79
-rw-r--r--multimedia/totem-gstreamer/Makefile3
-rw-r--r--multimedia/totem/Makefile14
-rw-r--r--multimedia/totem/distinfo4
-rw-r--r--multimedia/totem/files/patch-data_Makefile.in13
-rw-r--r--multimedia/totem/pkg-plist24
-rw-r--r--net/gnome-netstatus/Makefile5
-rw-r--r--net/gnome-netstatus/distinfo4
-rw-r--r--net/gnome-netstatus/files/patch-src_netstatus-iface.c11
-rw-r--r--net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c147
-rw-r--r--net/gnome-netstatus/pkg-plist2
-rw-r--r--net/gnome-nettool/Makefile5
-rw-r--r--net/gnome-nettool/distinfo4
-rw-r--r--net/gnome-nettool/files/patch-src_info.c33
-rw-r--r--net/gnome-nettool/files/patch-src_nettool.c16
-rw-r--r--net/gnome-nettool/pkg-plist6
-rw-r--r--net/gnomenetstatus/Makefile5
-rw-r--r--net/gnomenetstatus/distinfo4
-rw-r--r--net/gnomenetstatus/files/patch-src_netstatus-iface.c11
-rw-r--r--net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c147
-rw-r--r--net/gnomenetstatus/pkg-plist2
-rw-r--r--net/gnomenettool/Makefile5
-rw-r--r--net/gnomenettool/distinfo4
-rw-r--r--net/gnomenettool/files/patch-src_info.c33
-rw-r--r--net/gnomenettool/files/patch-src_nettool.c16
-rw-r--r--net/gnomenettool/pkg-plist6
-rw-r--r--net/vino/Makefile4
-rw-r--r--net/vino/distinfo4
-rw-r--r--net/vino/pkg-plist12
-rw-r--r--print/libgnomeprint/Makefile4
-rw-r--r--print/libgnomeprint/distinfo4
-rw-r--r--print/libgnomeprint/pkg-plist2
-rw-r--r--sysutils/Makefile1
-rw-r--r--sysutils/gconf-editor/Makefile5
-rw-r--r--sysutils/gconf-editor/distinfo4
-rw-r--r--sysutils/gconf-editor/pkg-plist2
-rw-r--r--sysutils/gnome-control-center/Makefile13
-rw-r--r--sysutils/gnome-control-center/distinfo4
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c18
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in11
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c33
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c29
-rw-r--r--sysutils/gnome-control-center/files/patch-configure8
-rw-r--r--sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in11
-rw-r--r--sysutils/gnome-control-center/pkg-plist65
-rw-r--r--sysutils/gnome-system-monitor/Makefile4
-rw-r--r--sysutils/gnome-system-monitor/distinfo4
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src::proctable.c42
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src_interface.c21
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src_openfiles.c32
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src_util.c34
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist4
-rw-r--r--sysutils/gnome-system-tools/Makefile22
-rw-r--r--sysutils/gnome-system-tools/distinfo4
-rw-r--r--sysutils/gnome-system-tools/files/patch-backends_replace.pl.in34
-rw-r--r--sysutils/gnome-system-tools/files/patch-configure6
-rw-r--r--sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c18
-rw-r--r--sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c11
-rw-r--r--sysutils/gnome-system-tools/files/patch-src_network_location.c11
-rw-r--r--sysutils/gnome-system-tools/pkg-plist102
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile13
-rw-r--r--sysutils/gnomecontrolcenter2/distinfo4
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c18
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in11
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c33
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c29
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-configure8
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in11
-rw-r--r--sysutils/gnomecontrolcenter2/pkg-plist65
-rw-r--r--sysutils/gnomesystemmonitor/Makefile4
-rw-r--r--sysutils/gnomesystemmonitor/distinfo4
-rw-r--r--sysutils/gnomesystemmonitor/files/patch-src::proctable.c42
-rw-r--r--sysutils/gnomesystemmonitor/files/patch-src_interface.c21
-rw-r--r--sysutils/gnomesystemmonitor/files/patch-src_openfiles.c32
-rw-r--r--sysutils/gnomesystemmonitor/files/patch-src_util.c34
-rw-r--r--sysutils/gnomesystemmonitor/pkg-plist4
-rw-r--r--sysutils/gnomesystemtools/Makefile22
-rw-r--r--sysutils/gnomesystemtools/distinfo4
-rw-r--r--sysutils/gnomesystemtools/files/patch-backends_replace.pl.in34
-rw-r--r--sysutils/gnomesystemtools/files/patch-backends_service-list.pl.in10
-rw-r--r--sysutils/gnomesystemtools/files/patch-configure6
-rw-r--r--sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c18
-rw-r--r--sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c11
-rw-r--r--sysutils/gnomesystemtools/files/patch-src_network_location.c11
-rw-r--r--sysutils/gnomesystemtools/pkg-plist102
-rw-r--r--sysutils/nautilus-cd-burner/Makefile4
-rw-r--r--sysutils/nautilus-cd-burner/distinfo4
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c15
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-make-iso.c18
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c (renamed from sysutils/nautilus-cd-burner/files/patch-cd-drive.c)117
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c16
-rw-r--r--sysutils/nautilus-cd-burner/pkg-plist11
-rw-r--r--sysutils/system-tools-backends/Makefile45
-rw-r--r--sysutils/system-tools-backends/distinfo2
-rw-r--r--sysutils/system-tools-backends/files/patch-replace.pl.in29
-rw-r--r--sysutils/system-tools-backends/files/patch-service-list.pl.in (renamed from sysutils/gnome-system-tools/files/patch-backends_service-list.pl.in)4
-rw-r--r--sysutils/system-tools-backends/pkg-descr4
-rw-r--r--sysutils/system-tools-backends/pkg-plist96
-rw-r--r--textproc/Makefile1
-rw-r--r--textproc/gnome-doc-utils/Makefile42
-rw-r--r--textproc/gnome-doc-utils/distinfo2
-rw-r--r--textproc/gnome-doc-utils/pkg-descr1
-rw-r--r--textproc/gnome-doc-utils/pkg-plist101
-rw-r--r--textproc/gnomedocutils/Makefile42
-rw-r--r--textproc/gnomedocutils/distinfo2
-rw-r--r--textproc/gnomedocutils/pkg-descr1
-rw-r--r--textproc/gnomedocutils/pkg-plist101
-rw-r--r--www/epiphany-extensions/Makefile8
-rw-r--r--www/epiphany-extensions/distinfo4
-rw-r--r--www/epiphany-extensions/pkg-plist113
-rw-r--r--www/epiphany/Makefile17
-rw-r--r--www/epiphany/distinfo4
-rw-r--r--www/epiphany/pkg-plist26
-rw-r--r--www/evolution-webcal/Makefile5
-rw-r--r--www/evolution-webcal/distinfo4
-rw-r--r--www/evolution-webcal/pkg-plist7
-rw-r--r--www/gtkhtml3/Makefile10
-rw-r--r--www/gtkhtml3/distinfo4
-rw-r--r--www/gtkhtml3/files/patch-po_Makefile.in.in (renamed from mail/evolution-exchange/files/patch-po::Makefile.in.in)11
-rw-r--r--www/gtkhtml3/files/patch-src_htmltext.c15
-rw-r--r--www/gtkhtml3/pkg-plist3
-rw-r--r--www/gtkhtml38/Makefile10
-rw-r--r--www/gtkhtml38/distinfo4
-rw-r--r--www/gtkhtml38/files/patch-po_Makefile.in.in (renamed from mail/ximian-connector/files/patch-po::Makefile.in.in)11
-rw-r--r--www/gtkhtml38/files/patch-src_htmltext.c15
-rw-r--r--www/gtkhtml38/pkg-plist3
-rw-r--r--x11-fm/nautilus2/Makefile12
-rw-r--r--x11-fm/nautilus2/distinfo4
-rw-r--r--x11-fm/nautilus2/files/patch-Makefile.in21
-rw-r--r--x11-fm/nautilus2/files/patch-aa9
-rw-r--r--x11-fm/nautilus2/files/patch-components-image_properties-nautilus-image-properties-view.c18
-rw-r--r--x11-fm/nautilus2/files/patch-data_static_bookmarks.xml84
-rw-r--r--x11-fm/nautilus2/files/patch-libbackground_Makefile.in11
-rw-r--r--x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c14
-rw-r--r--x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c31
-rw-r--r--x11-fm/nautilus2/pkg-plist62
-rw-r--r--x11-themes/Makefile1
-rw-r--r--x11-themes/gnome-backgrounds/Makefile26
-rw-r--r--x11-themes/gnome-backgrounds/distinfo2
-rw-r--r--x11-themes/gnome-backgrounds/pkg-descr1
-rw-r--r--x11-themes/gnome-backgrounds/pkg-plist58
-rw-r--r--x11-themes/gnome-themes/Makefile6
-rw-r--r--x11-themes/gnome-themes/distinfo4
-rw-r--r--x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-pixmaps.c14
-rw-r--r--x11-themes/gnome-themes/pkg-plist169
-rw-r--r--x11-themes/gtk-engines2/Makefile18
-rw-r--r--x11-themes/gtk-engines2/distinfo4
-rw-r--r--x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-gradient.c (renamed from x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-gradient.c)4
-rw-r--r--x11-themes/gtk-engines2/files/patch-engines_industrial_src_industrial_style.c10
-rw-r--r--x11-themes/gtk-engines2/files/patch-pixbuf_pixbuf-draw.c11
-rw-r--r--x11-themes/gtk-engines2/pkg-plist107
-rw-r--r--x11-toolkits/eel/Makefile7
-rw-r--r--x11-toolkits/eel/distinfo4
-rw-r--r--x11-toolkits/eel/files/patch-eel::eel-vfs-extensions.c15
-rw-r--r--x11-toolkits/eel/pkg-plist4
-rw-r--r--x11-toolkits/gal2/Makefile22
-rw-r--r--x11-toolkits/gal2/distinfo4
-rw-r--r--x11-toolkits/gal2/files/patch-ab16
-rw-r--r--x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c30
-rw-r--r--x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c46
-rw-r--r--x11-toolkits/gal2/files/patch-po_da.po16
-rw-r--r--x11-toolkits/gal2/files/patch-po_zh_CN.po17
-rw-r--r--x11-toolkits/gal2/pkg-plist9
-rw-r--r--x11-toolkits/gtk20/Makefile11
-rw-r--r--x11-toolkits/gtk20/distinfo4
-rw-r--r--x11-toolkits/gtk20/files/patch-ad23
-rw-r--r--x11-toolkits/gtk20/files/patch-ag19
-rw-r--r--x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in22
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_Makefile.in17
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_gtkentry.c13
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c20
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c26
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c16
-rw-r--r--x11-toolkits/gtk20/pkg-plist38
-rw-r--r--x11-toolkits/gtk30/Makefile11
-rw-r--r--x11-toolkits/gtk30/distinfo4
-rw-r--r--x11-toolkits/gtk30/files/patch-ad23
-rw-r--r--x11-toolkits/gtk30/files/patch-ag19
-rw-r--r--x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in22
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_Makefile.in17
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_gtkentry.c13
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_gtkiconcache.c20
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c26
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c16
-rw-r--r--x11-toolkits/gtk30/pkg-plist38
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile4
-rw-r--r--x11-toolkits/libgnomeprintui/distinfo4
-rw-r--r--x11-toolkits/libgnomeprintui/pkg-plist4
-rw-r--r--x11-toolkits/libgnomeui/Makefile4
-rw-r--r--x11-toolkits/libgnomeui/distinfo4
-rw-r--r--x11-toolkits/libgnomeui/files/patch-Makefile.in11
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in11
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-ice.c20
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist97
-rw-r--r--x11-toolkits/libwnck/Makefile5
-rw-r--r--x11-toolkits/libwnck/distinfo4
-rw-r--r--x11-toolkits/libwnck/pkg-plist5
-rw-r--r--x11-toolkits/pango/Makefile4
-rw-r--r--x11-toolkits/pango/distinfo6
-rw-r--r--x11-toolkits/pango/pkg-plist12
-rw-r--r--x11-wm/metacity/Makefile7
-rw-r--r--x11-wm/metacity/distinfo4
-rw-r--r--x11-wm/metacity/files/patch-configure10
-rw-r--r--x11-wm/metacity/pkg-plist7
-rw-r--r--x11/Makefile1
-rw-r--r--x11/gnome-applets/Makefile31
-rw-r--r--x11/gnome-applets/distinfo4
-rw-r--r--x11/gnome-applets/files/patch-aa136
-rw-r--r--x11/gnome-applets/files/patch-ad354
-rw-r--r--x11/gnome-applets/files/patch-battstat-acpi378
-rw-r--r--x11/gnome-applets/files/patch-battstat_battstat.schemas.in2
-rw-r--r--x11/gnome-applets/files/patch-cpufreq-freebsd514
-rw-r--r--x11/gnome-applets/files/patch-cpufreq-selector-freebsd373
-rw-r--r--x11/gnome-applets/files/patch-gkb-new_presets.c11
-rw-r--r--x11/gnome-applets/files/patch-gweather_weather-iwin.c9
-rw-r--r--x11/gnome-applets/files/patch-gweather_weather.c12
-rw-r--r--x11/gnome-applets/files/patch-modemlights_Makefile.in10
-rw-r--r--x11/gnome-applets/files/patch-modemlights_modem-applet.c22
-rw-r--r--x11/gnome-applets/files/patch-wireless_wireless-applet.c349
-rw-r--r--x11/gnome-applets/pkg-plist886
-rw-r--r--x11/gnome-desktop/Makefile6
-rw-r--r--x11/gnome-desktop/distinfo4
-rw-r--r--x11/gnome-desktop/pkg-plist31
-rw-r--r--x11/gnome-menus/Makefile39
-rw-r--r--x11/gnome-menus/distinfo2
-rw-r--r--x11/gnome-menus/files/KDE.directory (renamed from devel/gnome-vfs/files/KDE.directory)0
-rw-r--r--x11/gnome-menus/files/patch-layout::applications.menu349
-rw-r--r--x11/gnome-menus/files/patch-layout::preferences.menu41
-rw-r--r--x11/gnome-menus/files/patch-layout::settings.menu32
-rw-r--r--x11/gnome-menus/files/patch-libmenu::menu-tree.c173
-rw-r--r--x11/gnome-menus/files/patch-libmenu::menu-tree.h14
-rw-r--r--x11/gnome-menus/pkg-descr12
-rw-r--r--x11/gnome-menus/pkg-plist77
-rw-r--r--x11/gnome-panel/Makefile13
-rw-r--r--x11/gnome-panel/distinfo4
-rw-r--r--x11/gnome-panel/pkg-plist95
-rw-r--r--x11/gnome-session/Makefile29
-rw-r--r--x11/gnome-session/distinfo8
-rw-r--r--x11/gnome-session/files/patch-gnome-session_Makefile.in12
-rw-r--r--x11/gnome-session/files/patch-gnome-session_logout.c36
-rw-r--r--x11/gnome-session/files/patch-gnome-session_manager.c14
-rw-r--r--x11/gnome-session/pkg-plist12
-rw-r--r--x11/gnome-terminal/Makefile8
-rw-r--r--x11/gnome-terminal/distinfo4
-rw-r--r--x11/gnome-terminal/files/patch-src::terminal-screen.c24
-rw-r--r--x11/gnome-terminal/pkg-plist8
-rw-r--r--x11/gnome2-fifth-toe/Makefile22
-rw-r--r--x11/gnome2-lite/Makefile12
-rw-r--r--x11/gnome2-power-tools/Makefile10
-rw-r--r--x11/gnome2/Makefile17
-rw-r--r--x11/gnomeapplets2/Makefile31
-rw-r--r--x11/gnomeapplets2/distinfo4
-rw-r--r--x11/gnomeapplets2/files/patch-aa136
-rw-r--r--x11/gnomeapplets2/files/patch-ad354
-rw-r--r--x11/gnomeapplets2/files/patch-battstat-acpi378
-rw-r--r--x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in2
-rw-r--r--x11/gnomeapplets2/files/patch-cpufreq-freebsd514
-rw-r--r--x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd373
-rw-r--r--x11/gnomeapplets2/files/patch-gkb-new_presets.c11
-rw-r--r--x11/gnomeapplets2/files/patch-gweather_weather-iwin.c9
-rw-r--r--x11/gnomeapplets2/files/patch-gweather_weather.c12
-rw-r--r--x11/gnomeapplets2/files/patch-modemlights_Makefile.in10
-rw-r--r--x11/gnomeapplets2/files/patch-modemlights_modem-applet.c22
-rw-r--r--x11/gnomeapplets2/files/patch-wireless_wireless-applet.c349
-rw-r--r--x11/gnomeapplets2/pkg-plist886
-rw-r--r--x11/gnomedesktop/Makefile6
-rw-r--r--x11/gnomedesktop/distinfo4
-rw-r--r--x11/gnomedesktop/pkg-plist31
-rw-r--r--x11/gnomepanel/Makefile13
-rw-r--r--x11/gnomepanel/distinfo4
-rw-r--r--x11/gnomepanel/pkg-plist95
-rw-r--r--x11/gnomesession/Makefile29
-rw-r--r--x11/gnomesession/distinfo8
-rw-r--r--x11/gnomesession/files/patch-gnome-session_Makefile.in12
-rw-r--r--x11/gnomesession/files/patch-gnome-session_logout.c36
-rw-r--r--x11/gnomesession/files/patch-gnome-session_manager.c14
-rw-r--r--x11/gnomesession/pkg-plist12
-rw-r--r--x11/gnometerminal/Makefile8
-rw-r--r--x11/gnometerminal/distinfo4
-rw-r--r--x11/gnometerminal/files/patch-src::terminal-screen.c24
-rw-r--r--x11/gnometerminal/pkg-plist8
-rw-r--r--x11/libgnome/Makefile10
-rw-r--r--x11/libgnome/distinfo4
-rw-r--r--x11/libgnome/files/patch-libgnome_gnome-program.c13
-rw-r--r--x11/libgnome/pkg-plist56
-rw-r--r--x11/libxklavier/Makefile8
-rw-r--r--x11/libxklavier/distinfo4
-rw-r--r--x11/libxklavier/files/patch-configure33
-rw-r--r--x11/libxklavier/files/patch-libxklavier-xklavier_config_i18n.c18
-rw-r--r--x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c15
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier.c23
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c11
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c22
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c15
-rw-r--r--x11/libxklavier/files/patch-tests-test_config.c19
-rw-r--r--x11/libxklavier/files/patch-tests-test_monitor.c19
-rw-r--r--x11/libxklavier/pkg-plist6
-rw-r--r--x11/yelp/Makefile80
-rw-r--r--x11/yelp/distinfo4
-rw-r--r--x11/yelp/files/gnome-help.sh17
-rw-r--r--x11/yelp/files/patch-configure11
-rw-r--r--x11/yelp/files/yelp.sh17
-rw-r--r--x11/yelp/pkg-plist64
-rw-r--r--x11/zenity/Makefile5
-rw-r--r--x11/zenity/distinfo4
-rw-r--r--x11/zenity/pkg-plist6
567 files changed, 9616 insertions, 9419 deletions
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index f3ee2481e754..4c4ec4d0e1dd 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for: atk
-# Date Created: 14 May 2001
-# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
+# New ports collection makefile for: atk
+# Date Created: 14 May 2001
+# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= atk
-PORTVERSION= 1.8.0
+PORTVERSION= 1.9.1
CATEGORIES= accessibility devel
MASTER_SITES= ${MASTER_SITE_GNOME} \
- ftp://ftp.gtk.org/pub/gtk/v2.4/
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.8
+ ftp://ftp.gtk.org/pub/gtk/v2.6/
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.9
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index ac7f3c0887bc..c6fba736eec7 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/atk-1.8.0.tar.bz2) = fc46940febb0e91427b77457e6356f3d
-SIZE (gnome2/atk-1.8.0.tar.bz2) = 500156
+MD5 (gnome2/atk-1.9.1.tar.bz2) = 689eb6a77215858eb804f6dcc90058be
+SIZE (gnome2/atk-1.9.1.tar.bz2) = 483363
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 5e0de79d6386..6711eb473ba6 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -26,41 +26,12 @@ include/atk-1.0/atk/atkutil.h
include/atk-1.0/atk/atkvalue.h
lib/libatk-1.0.a
lib/libatk-1.0.so
-lib/libatk-1.0.so.800
+lib/libatk-1.0.so.901
libdata/pkgconfig/atk.pc
-%%DOCSDIR%%/AtkAction.html
-%%DOCSDIR%%/AtkComponent.html
-%%DOCSDIR%%/AtkDocument.html
-%%DOCSDIR%%/AtkEditableText.html
-%%DOCSDIR%%/AtkGObjectAccessible.html
-%%DOCSDIR%%/AtkHyperlink.html
-%%DOCSDIR%%/AtkHypertext.html
-%%DOCSDIR%%/AtkImage.html
-%%DOCSDIR%%/AtkNoOpObject.html
-%%DOCSDIR%%/AtkNoOpObjectFactory.html
-%%DOCSDIR%%/AtkObject.html
-%%DOCSDIR%%/AtkObjectFactory.html
-%%DOCSDIR%%/AtkRegistry.html
-%%DOCSDIR%%/AtkRelation.html
-%%DOCSDIR%%/AtkRelationSet.html
-%%DOCSDIR%%/AtkSelection.html
-%%DOCSDIR%%/AtkStateSet.html
-%%DOCSDIR%%/AtkStreamableContent.html
-%%DOCSDIR%%/AtkTable.html
-%%DOCSDIR%%/AtkText.html
-%%DOCSDIR%%/AtkUtil.html
-%%DOCSDIR%%/AtkValue.html
-%%DOCSDIR%%/atk-AtkState.html
-%%DOCSDIR%%/atk.devhelp
-%%DOCSDIR%%/atk.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/up.png
share/locale/af/LC_MESSAGES/atk10.mo
share/locale/am/LC_MESSAGES/atk10.mo
+share/locale/ar/LC_MESSAGES/atk10.mo
+share/locale/as/LC_MESSAGES/atk10.mo
share/locale/az/LC_MESSAGES/atk10.mo
share/locale/be/LC_MESSAGES/atk10.mo
share/locale/bg/LC_MESSAGES/atk10.mo
@@ -120,14 +91,18 @@ share/locale/sr@Latn/LC_MESSAGES/atk10.mo
share/locale/sr@ije/LC_MESSAGES/atk10.mo
share/locale/sv/LC_MESSAGES/atk10.mo
share/locale/ta/LC_MESSAGES/atk10.mo
+share/locale/th/LC_MESSAGES/atk10.mo
share/locale/tk/LC_MESSAGES/atk10.mo
share/locale/tr/LC_MESSAGES/atk10.mo
share/locale/uk/LC_MESSAGES/atk10.mo
share/locale/vi/LC_MESSAGES/atk10.mo
share/locale/wa/LC_MESSAGES/atk10.mo
+share/locale/xh/LC_MESSAGES/atk10.mo
share/locale/yi/LC_MESSAGES/atk10.mo
share/locale/zh_CN/LC_MESSAGES/atk10.mo
share/locale/zh_TW/LC_MESSAGES/atk10.mo
+@unexec rmdir %D/share/locale/as/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/as 2> /dev/null || true
@unexec rmdir %D/share/locale/li/LC_MESSAGES 2> /dev/null || true
@unexec rmdir %D/share/locale/li 2> /dev/null || true
@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index c93d7ee10dfe..8ada000f1a79 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= dasher
-PORTVERSION= 3.2.11
-PORTREVISION= 4
+PORTVERSION= 3.2.15
CATEGORIES= accessibility editors x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/3.2
@@ -22,9 +21,11 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi
+USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \
+ libwnck
WANT_GNOME= yes
USE_LIBTOOL_VER=15
+INSTALLS_OMF= yes
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo
index 9c279f0959c9..02812ef26e43 100644
--- a/accessibility/dasher/distinfo
+++ b/accessibility/dasher/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/dasher-3.2.11.tar.bz2) = f3180d8ec786c1ea158cc5ac0894856c
-SIZE (gnome2/dasher-3.2.11.tar.bz2) = 2651970
+MD5 (gnome2/dasher-3.2.15.tar.bz2) = a3fa85e32c94c69476e12ecba7d257e7
+SIZE (gnome2/dasher-3.2.15.tar.bz2) = 8981223
diff --git a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc b/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
index 93031e47f2c4..05d3c3b835fd 100644
--- a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
+++ b/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
@@ -1,20 +1,11 @@
---- Src/Gtk2/speech.cc.orig Fri Jul 30 15:28:41 2004
-+++ Src/Gtk2/speech.cc Sun Feb 13 20:15:46 2005
-@@ -46,7 +46,7 @@
-
- voices = GNOME_Speech_SynthesisDriver_getAllVoices (rv, &ev);
-
-- if (voices==NULL || BONOBO_EX (&ev)) {
-+ if (voices==NULL || BONOBO_EX (&ev) || voices->_length==0) {
- printf(_("Unable to initialize voices"));
- speaker=NULL;
- return;
+--- Src/Gtk2/speech.cc.orig Fri Sep 17 06:53:53 2004
++++ Src/Gtk2/speech.cc Sat Feb 26 01:00:12 2005
@@ -78,7 +78,8 @@
void teardown_speech() {
bonobo_object_release_unref (speaker, NULL);
- CORBA_free (voices);
-+ if (voices != NULL && voices->_length != 0)
++ if (voices != NULL && !BONOBO_EX (&ev) && voices->_length != 0)
+ CORBA_free (voices);
CORBA_exception_free (&ev);
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index 2d6c939517fc..1be84180bf55 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -1,6 +1,8 @@
bin/dasher
share/gnome/applications/dasher.desktop
share/gnome/dasher/alphabet.Armenian.xml
+share/gnome/dasher/alphabet.Assamese.xml
+share/gnome/dasher/alphabet.Austen.xml
share/gnome/dasher/alphabet.Azerbaijani.xml
share/gnome/dasher/alphabet.Belarusian.xml
share/gnome/dasher/alphabet.Bengali.xml
@@ -9,23 +11,37 @@ share/gnome/dasher/alphabet.Esperanto.xml
share/gnome/dasher/alphabet.Estonian.xml
share/gnome/dasher/alphabet.Filipino.xml
share/gnome/dasher/alphabet.Greek.xml
+share/gnome/dasher/alphabet.Gujarati.xml
share/gnome/dasher/alphabet.Hebrew.xml
+share/gnome/dasher/alphabet.Hindi.xml
share/gnome/dasher/alphabet.Icelandic.xml
share/gnome/dasher/alphabet.Igbo.xml
share/gnome/dasher/alphabet.Indonesian.xml
share/gnome/dasher/alphabet.IrishGaelic.xml
+share/gnome/dasher/alphabet.Japanese.xml
+share/gnome/dasher/alphabet.Joyo.xml
+share/gnome/dasher/alphabet.Joyo2.xml
+share/gnome/dasher/alphabet.Kannada.xml
+share/gnome/dasher/alphabet.Katakana.xml
share/gnome/dasher/alphabet.Malay.xml
+share/gnome/dasher/alphabet.Malayalam.xml
+share/gnome/dasher/alphabet.Marathi.xml
share/gnome/dasher/alphabet.Moldavian.xml
share/gnome/dasher/alphabet.Ndebele.xml
+share/gnome/dasher/alphabet.Oriya.xml
+share/gnome/dasher/alphabet.Punjabi.xml
share/gnome/dasher/alphabet.Romanian.xml
share/gnome/dasher/alphabet.Sami.xml
share/gnome/dasher/alphabet.ScotsGaelic.xml
share/gnome/dasher/alphabet.Sepedi.xml
share/gnome/dasher/alphabet.Sesotho.xml
+share/gnome/dasher/alphabet.Sinhala.xml
share/gnome/dasher/alphabet.Slovak.xml
share/gnome/dasher/alphabet.Slovenian.xml
share/gnome/dasher/alphabet.Swati.xml
share/gnome/dasher/alphabet.Tajik.xml
+share/gnome/dasher/alphabet.Tamil.xml
+share/gnome/dasher/alphabet.Telugu.xml
share/gnome/dasher/alphabet.Thai.xml
share/gnome/dasher/alphabet.Tsonga.xml
share/gnome/dasher/alphabet.Tswana.xml
@@ -34,12 +50,20 @@ share/gnome/dasher/alphabet.Vietnamese.xml
share/gnome/dasher/alphabet.Xhosa.xml
share/gnome/dasher/alphabet.Yoruba.xml
share/gnome/dasher/alphabet.Zulu.xml
+share/gnome/dasher/alphabet.afrikaans.xml
share/gnome/dasher/alphabet.albanian.xml
+share/gnome/dasher/alphabet.arabic.xml
+share/gnome/dasher/alphabet.bengali.xml
+share/gnome/dasher/alphabet.bopomofo.xml
+share/gnome/dasher/alphabet.catalan.xml
+share/gnome/dasher/alphabet.chinese.xml
+share/gnome/dasher/alphabet.chineseRuby.xml
share/gnome/dasher/alphabet.czech.xml
share/gnome/dasher/alphabet.danish.xml
share/gnome/dasher/alphabet.dtd
share/gnome/dasher/alphabet.dutch.xml
share/gnome/dasher/alphabet.english.xml
+share/gnome/dasher/alphabet.english2.xml
share/gnome/dasher/alphabet.finnish.xml
share/gnome/dasher/alphabet.french.xml
share/gnome/dasher/alphabet.german.xml
@@ -50,33 +74,77 @@ share/gnome/dasher/alphabet.hungarian.xml
share/gnome/dasher/alphabet.hungarianLowerCase.xml
share/gnome/dasher/alphabet.ipa.xml
share/gnome/dasher/alphabet.italian.xml
+share/gnome/dasher/alphabet.klingon.xml
share/gnome/dasher/alphabet.korean.xml
share/gnome/dasher/alphabet.mongolian.xml
+share/gnome/dasher/alphabet.mongolian2.xml
share/gnome/dasher/alphabet.norwegian.xml
+share/gnome/dasher/alphabet.persian.xml
+share/gnome/dasher/alphabet.pinyin.xml
share/gnome/dasher/alphabet.polish.xml
share/gnome/dasher/alphabet.portuguese.xml
share/gnome/dasher/alphabet.russian.xml
share/gnome/dasher/alphabet.spanish.xml
share/gnome/dasher/alphabet.swahili.xml
share/gnome/dasher/alphabet.swedish.xml
+share/gnome/dasher/alphabet.thaana.xml
+share/gnome/dasher/alphabet.venda.xml
share/gnome/dasher/alphabet.welsh.xml
share/gnome/dasher/alphabet.xsl
share/gnome/dasher/colour.dtd
share/gnome/dasher/colour.hiragana.xml
share/gnome/dasher/colour.xml
share/gnome/dasher/dasher.glade
+share/gnome/dasher/training_Afrikaans_ZA.txt
+share/gnome/dasher/training_Assamese_IN.txt
+share/gnome/dasher/training_English_ZA.txt
+share/gnome/dasher/training_Esperanto_XX.txt
+share/gnome/dasher/training_Gujarati_IN.txt
+share/gnome/dasher/training_Hindi_IN.txt
+share/gnome/dasher/training_Japanese_JP.txt
+share/gnome/dasher/training_Kannada_IN.txt
+share/gnome/dasher/training_Kashmiri_IN.txt
+share/gnome/dasher/training_Malayalam_IN.txt
+share/gnome/dasher/training_Marathi_IN.txt
+share/gnome/dasher/training_Ndebele_ZA.txt
+share/gnome/dasher/training_Oriya_IN.txt
+share/gnome/dasher/training_Punjabi_IN.txt
+share/gnome/dasher/training_Punjabi_IPA_IN.txt
+share/gnome/dasher/training_Sepedi_ZA.txt
+share/gnome/dasher/training_Sesotho_ZA.txt
+share/gnome/dasher/training_Sinhala_IN.txt
+share/gnome/dasher/training_Swati_ZA.txt
+share/gnome/dasher/training_Tamil_IN.txt
+share/gnome/dasher/training_Telugu_IN.txt
+share/gnome/dasher/training_Tsonga_ZA.txt
+share/gnome/dasher/training_Tswana_ZA.txt
+share/gnome/dasher/training_Urdu_PK.txt
+share/gnome/dasher/training_Venda_ZA.txt
+share/gnome/dasher/training_Xhosa_ZA.txt
+share/gnome/dasher/training_Zulu_ZA.txt
+share/gnome/dasher/training_albanian_SQ.txt
+share/gnome/dasher/training_bengali_BD.txt
+share/gnome/dasher/training_bengali_bn.txt
share/gnome/dasher/training_czech_CS.txt
+share/gnome/dasher/training_danish_DK.txt
share/gnome/dasher/training_dutch_NL.txt
share/gnome/dasher/training_english_GB.txt
+share/gnome/dasher/training_finnish_FI.txt
share/gnome/dasher/training_french_FR.txt
share/gnome/dasher/training_german_DE.txt
+share/gnome/dasher/training_greek_GR.txt
share/gnome/dasher/training_hebrew_IL.txt
share/gnome/dasher/training_hiragana60_JP.txt
share/gnome/dasher/training_hiragana83_JP.txt
+share/gnome/dasher/training_hungarian_HU.txt
share/gnome/dasher/training_italian_IT.txt
share/gnome/dasher/training_mongolian_MN.txt
+share/gnome/dasher/training_polish_PL.txt
share/gnome/dasher/training_portuguese_BR.txt
share/gnome/dasher/training_russian_RU.txt
+share/gnome/dasher/training_spanish_ES.txt
+share/gnome/dasher/training_swahili_KE.txt
+share/gnome/dasher/training_swedish_SE.txt
share/gnome/dasher/training_welsh_GB.txt
share/gnome/help/dasher/C/dasher.xml
share/gnome/help/dasher/C/figures/figure2.png
@@ -89,12 +157,12 @@ share/gnome/help/dasher/C/figures/prefs5.png
share/gnome/help/dasher/C/version.xml
share/gnome/icons/dasher.png
share/gnome/omf/dasher/dasher-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/dasher/dasher-C.omf 2>/dev/null || /usr/bin/true
share/locale/ar/LC_MESSAGES/dasher.mo
share/locale/az/LC_MESSAGES/dasher.mo
share/locale/be/LC_MESSAGES/dasher.mo
share/locale/bg/LC_MESSAGES/dasher.mo
share/locale/bn/LC_MESSAGES/dasher.mo
+share/locale/bs/LC_MESSAGES/dasher.mo
share/locale/ca/LC_MESSAGES/dasher.mo
share/locale/cs/LC_MESSAGES/dasher.mo
share/locale/cy/LC_MESSAGES/dasher.mo
@@ -108,7 +176,9 @@ share/locale/et/LC_MESSAGES/dasher.mo
share/locale/fi/LC_MESSAGES/dasher.mo
share/locale/fr/LC_MESSAGES/dasher.mo
share/locale/ga/LC_MESSAGES/dasher.mo
+share/locale/gu/LC_MESSAGES/dasher.mo
share/locale/he/LC_MESSAGES/dasher.mo
+share/locale/hi/LC_MESSAGES/dasher.mo
share/locale/hr/LC_MESSAGES/dasher.mo
share/locale/hu/LC_MESSAGES/dasher.mo
share/locale/id/LC_MESSAGES/dasher.mo
@@ -116,8 +186,10 @@ share/locale/it/LC_MESSAGES/dasher.mo
share/locale/ja/LC_MESSAGES/dasher.mo
share/locale/ko/LC_MESSAGES/dasher.mo
share/locale/lt/LC_MESSAGES/dasher.mo
+share/locale/mk/LC_MESSAGES/dasher.mo
share/locale/mn/LC_MESSAGES/dasher.mo
share/locale/ms/LC_MESSAGES/dasher.mo
+share/locale/nb/LC_MESSAGES/dasher.mo
share/locale/ne/LC_MESSAGES/dasher.mo
share/locale/nl/LC_MESSAGES/dasher.mo
share/locale/no/LC_MESSAGES/dasher.mo
@@ -132,6 +204,8 @@ share/locale/sq/LC_MESSAGES/dasher.mo
share/locale/sr/LC_MESSAGES/dasher.mo
share/locale/sr@Latn/LC_MESSAGES/dasher.mo
share/locale/sv/LC_MESSAGES/dasher.mo
+share/locale/ta/LC_MESSAGES/dasher.mo
+share/locale/tk/LC_MESSAGES/dasher.mo
share/locale/tr/LC_MESSAGES/dasher.mo
share/locale/uk/LC_MESSAGES/dasher.mo
share/locale/zh_CN/LC_MESSAGES/dasher.mo
@@ -141,4 +215,3 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo
@dirrm share/gnome/help/dasher/C
@dirrm share/gnome/help/dasher
@dirrm share/gnome/dasher
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/dasher/dasher-C.omf 2>/dev/null || /usr/bin/true
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index bafc1568f22c..c0d6693a3696 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gnopernicus
-PORTVERSION= 0.9.19
-PORTREVISION= 1
+PORTVERSION= 0.10.4
CATEGORIES= accessibility x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -30,7 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAKE_ENV= SED="${SED}"
GCONF_SCHEMAS= brlmonitor.schemas gnopernicus.schemas remote.schemas
-SHLIB_VERSION= 19
+SHLIB_VERSION= 4
PLIST_SUB= SHLIB_VERSION=${SHLIB_VERSION}
post-patch:
diff --git a/accessibility/gnopernicus/distinfo b/accessibility/gnopernicus/distinfo
index 3525083d053d..4fe27d652517 100644
--- a/accessibility/gnopernicus/distinfo
+++ b/accessibility/gnopernicus/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnopernicus-0.9.19.tar.bz2) = f301f7f7a7324289f44ad7b33bf0282e
-SIZE (gnome2/gnopernicus-0.9.19.tar.bz2) = 1927562
+MD5 (gnome2/gnopernicus-0.10.4.tar.bz2) = cb105fa21d63e83c352a1f606d601196
+SIZE (gnome2/gnopernicus-0.10.4.tar.bz2) = 1953427
diff --git a/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRObject.c b/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRObject.c
new file mode 100644
index 000000000000..86addc0fc0c7
--- /dev/null
+++ b/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRObject.c
@@ -0,0 +1,14 @@
+--- srlow/libsrlow/SRObject.c.orig Mon Feb 28 17:11:27 2005
++++ srlow/libsrlow/SRObject.c Mon Feb 28 17:11:41 2005
+@@ -4206,9 +4206,10 @@
+ offset = AccessibleText_getCaretOffset (acc_text);
+ if (offset == AccessibleText_getCharacterCount (acc_text) && offset > 0)
+ {
++ char *ret;
+ offset--;
+ last = TRUE;/*the char is the last char in the text*/
+- char *ret = AccessibleText_getTextBeforeOffset (acc_text, offset+1,
++ ret = AccessibleText_getTextBeforeOffset (acc_text, offset+1,
+ SPI_TEXT_BOUNDARY_LINE_START, &line_start_offset, &line_end_offset);
+ SPI_freeString (ret);
+ if (offset == line_start_offset && offset > 0)
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 92608ea0f0f2..c8454aea254f 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gok
-PORTVERSION= 0.11.17
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= accessibility sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.11
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index a73abe7973dd..d47bf4756a68 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gok-0.11.17.tar.bz2) = 6d76c815e7d453cdbfc31f4c45659573
-SIZE (gnome2/gok-0.11.17.tar.bz2) = 1351575
+MD5 (gnome2/gok-1.0.2.tar.bz2) = c4ec4fcd39d43fc0aa43a222ff7ff7cb
+SIZE (gnome2/gok-1.0.2.tar.bz2) = 1440562
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index bfdaf701d972..560485898394 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -409,6 +409,16 @@ share/gnome/gok/nb/numberpad.kbd
share/gnome/gok/nb/quit.kbd
share/gnome/gok/nb/text-operations.kbd
share/gnome/gok/nb/valuator.kbd
+share/gnome/gok/ne/gok-controls.kbd
+share/gnome/gok/ne/hide.kbd
+share/gnome/gok/ne/launcher.kbd
+share/gnome/gok/ne/main.kbd
+share/gnome/gok/ne/mouse.kbd
+share/gnome/gok/ne/move-resize.kbd
+share/gnome/gok/ne/numberpad.kbd
+share/gnome/gok/ne/quit.kbd
+share/gnome/gok/ne/text-operations.kbd
+share/gnome/gok/ne/valuator.kbd
share/gnome/gok/nl/gok-controls.kbd
share/gnome/gok/nl/hide.kbd
share/gnome/gok/nl/launcher.kbd
@@ -472,6 +482,16 @@ share/gnome/gok/pt_BR/text-operations.kbd
share/gnome/gok/pt_BR/valuator.kbd
share/gnome/gok/quit.kbd
share/gnome/gok/qwerty.kbd
+share/gnome/gok/ro/gok-controls.kbd
+share/gnome/gok/ro/hide.kbd
+share/gnome/gok/ro/launcher.kbd
+share/gnome/gok/ro/main.kbd
+share/gnome/gok/ro/mouse.kbd
+share/gnome/gok/ro/move-resize.kbd
+share/gnome/gok/ro/numberpad.kbd
+share/gnome/gok/ro/quit.kbd
+share/gnome/gok/ro/text-operations.kbd
+share/gnome/gok/ro/valuator.kbd
share/gnome/gok/singlekey-automatic-scanning.xam
share/gnome/gok/singlekey-inverse-scanning.xam
share/gnome/gok/sl/gok-controls.kbd
@@ -619,12 +639,14 @@ share/locale/ml/LC_MESSAGES/gok.mo
share/locale/mn/LC_MESSAGES/gok.mo
share/locale/ms/LC_MESSAGES/gok.mo
share/locale/nb/LC_MESSAGES/gok.mo
+share/locale/ne/LC_MESSAGES/gok.mo
share/locale/nl/LC_MESSAGES/gok.mo
share/locale/no/LC_MESSAGES/gok.mo
share/locale/pa/LC_MESSAGES/gok.mo
share/locale/pl/LC_MESSAGES/gok.mo
share/locale/pt/LC_MESSAGES/gok.mo
share/locale/pt_BR/LC_MESSAGES/gok.mo
+share/locale/ro/LC_MESSAGES/gok.mo
share/locale/sl/LC_MESSAGES/gok.mo
share/locale/sq/LC_MESSAGES/gok.mo
share/locale/sr/LC_MESSAGES/gok.mo
@@ -648,12 +670,14 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
@dirrm share/gnome/gok/sr
@dirrm share/gnome/gok/sq
@dirrm share/gnome/gok/sl
+@dirrm share/gnome/gok/ro
@dirrm share/gnome/gok/pt_BR
@dirrm share/gnome/gok/pt
@dirrm share/gnome/gok/pl
@dirrm share/gnome/gok/pa
@dirrm share/gnome/gok/no
@dirrm share/gnome/gok/nl
+@dirrm share/gnome/gok/ne
@dirrm share/gnome/gok/nb
@dirrm share/gnome/gok/ms
@dirrm share/gnome/gok/mn
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index f87e29786621..4ba28821efe3 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -6,30 +6,40 @@
#
PORTNAME= fileroller
-PORTVERSION= 2.8.4
+PORTVERSION= 2.10.0
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/file-roller/2.8
+MASTER_SITE_SUBDIR= sources/file-roller/2.10
DISTNAME= file-roller-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= An archive manager for zip files, tar, etc
+# XXX: We need the ports version of gtar since gtar-1.13.25 included with
+# FreeBSD is not sufficient. If the base version of GNU tar is updated, then
+# we can do away with this dependency.
+RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar
+
USE_BZIP2= yes
-USE_X_PREFIX= yes
INSTALLS_OMF= yes
+USE_X_PREFIX= yes
+USE_REINPLACE= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils
+USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2
USE_LIBTOOL_VER=15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= file-roller.schemas
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${WRKSRC}/src/fr-command-tar.c
+
post-install:
- @-update-desktop-database > /dev/null
+ @-update-desktop-database
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
.for f in AUTHORS NEWS README TODO
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 924432cded1e..97e96af0d99b 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/file-roller-2.8.4.tar.bz2) = deabb6d24152457cf0afc036358602d4
-SIZE (gnome2/file-roller-2.8.4.tar.bz2) = 1410279
+MD5 (gnome2/file-roller-2.10.0.tar.bz2) = 0cb5b09aad7c9d352922994a6e8cf088
+SIZE (gnome2/file-roller-2.10.0.tar.bz2) = 1311026
diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c
index ea69f1180a69..ea0addced05c 100644
--- a/archivers/file-roller/files/patch-src_fr-command-tar.c
+++ b/archivers/file-roller/files/patch-src_fr-command-tar.c
@@ -1,73 +1,11 @@
---- src/fr-command-tar.c.orig Mon Apr 19 15:10:23 2004
-+++ src/fr-command-tar.c Tue Apr 20 02:15:36 2004
-@@ -226,6 +226,11 @@
- return g_strdup (f_start);
- }
+--- src/fr-command-tar.c.orig Sun Feb 20 17:17:15 2005
++++ src/fr-command-tar.c Sun Feb 20 17:19:07 2005
+@@ -219,7 +219,7 @@
+ /* In solaris gtar is present under /usr/sfw/bin */
-+static char *months[] = {
-+ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
-+ "Nov", "Dec"
-+};
-+
+ prev_path = g_getenv ("PATH");
+- temp = g_strdup_printf ("PATH=%s:%s", prev_path, "/usr/sfw/bin");
++ temp = g_strdup_printf ("PATH=%s:%s:%s", "%%LOCALBASE%%/bin", prev_path, "/usr/sfw/bin");
+ putenv (temp);
- static void
- process_line (char *line,
-@@ -234,28 +239,37 @@
- FileData *fdata;
- FRCommand *comm = FR_COMMAND (data);
- char **fields;
-- int date_idx;
-- char *field_date, *field_time, *field_size, *field_name;
-+ int i;
-+ struct tm tm = {0, };
-+ char **time_fields;
-+ const char *field_name;
-
- g_return_if_fail (line != NULL);
-
- fdata = file_data_new ();
-
-- date_idx = get_index_from_pattern (line, "%n%n%n%n-%n%n-%n%n %n%n:%n%n");
-+ fields = split_line (line, 7);
-+
-+ fdata->size = atol (fields[2]);
-+ for (i = 0; i < 12; i++) {
-+ if (!strncmp(fields[3], months[i], 3)) break;
-+ }
-
-- field_size = get_prev_field (line, date_idx, 1);
-- fdata->size = atol (field_size);
-- g_free (field_size);
--
-- field_date = get_next_field (line, date_idx, 1);
-- field_time = get_next_field (line, date_idx, 2);
-- fdata->modified = mktime_from_string (field_date, field_time);
-- g_free (field_date);
-- g_free (field_time);
-+ tm.tm_mon = i;
-+ tm.tm_year = atoi (fields[6]) - 1900;
-+ tm.tm_mday = atoi (fields[4]);
-+ time_fields = g_strsplit(fields[5], ":", 2);
-+ tm.tm_hour = atoi (time_fields[0]);
-+ tm.tm_min = atoi (time_fields[1]);
-+ tm.tm_sec = 0;
-+ tm.tm_isdst = -1;
-+ fdata->modified = mktime(&tm);
-+ g_strfreev (fields);
-+ g_strfreev (time_fields);
-
- /* Full path */
-
-- field_name = tar_get_last_field (line, date_idx, 3);
-+ field_name = get_last_field (line, 8);
- fields = g_strsplit (field_name, " -> ", 2);
-
- if (fields[1] == NULL) {
-@@ -274,7 +288,6 @@
- if (fields[1] != NULL)
- fdata->link = g_strdup (fields[1]);
- g_strfreev (fields);
-- g_free (field_name);
-
- fdata->name = g_strdup (file_name_from_path (fdata->full_path));
- fdata->path = remove_level_from_path (fdata->full_path);
+ path = g_find_program_in_path ("gtar");
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 187b11b08251..139cdaa0f85b 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -1,5 +1,6 @@
bin/file-roller
lib/bonobo/libfile-roller-component.so
+lib/nautilus/extensions-1.0/libnautilus-fileroller.so
libdata/bonobo/servers/File_Roller_Component.server
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -47,10 +48,11 @@ share/gnome/help/file-roller/ru/legal.xml
share/gnome/help/file-roller/sv/figures/file-roller_main_window.png
share/gnome/help/file-roller/sv/file-roller.xml
share/gnome/help/file-roller/sv/legal.xml
-share/gnome/help/file-roller/uk/figures/fr-add-dialog.png
-share/gnome/help/file-roller/uk/figures/fr-extract.png
-share/gnome/help/file-roller/uk/figures/fr-mainwindow.png
-share/gnome/help/file-roller/uk/figures/fr-prefs.png
+share/gnome/help/file-roller/uk/figures/file-roller_home.png
+share/gnome/help/file-roller/uk/figures/file-roller_leftarrow.png
+share/gnome/help/file-roller/uk/figures/file-roller_main_window.png
+share/gnome/help/file-roller/uk/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/uk/figures/file-roller_uparrow.png
share/gnome/help/file-roller/uk/file-roller.xml
share/gnome/help/file-roller/uk/legal.xml
share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png
@@ -141,6 +143,7 @@ share/locale/tk/LC_MESSAGES/file-roller.mo
share/locale/tr/LC_MESSAGES/file-roller.mo
share/locale/uk/LC_MESSAGES/file-roller.mo
share/locale/vi/LC_MESSAGES/file-roller.mo
+share/locale/xh/LC_MESSAGES/file-roller.mo
share/locale/zh_CN/LC_MESSAGES/file-roller.mo
share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/omf/file-roller
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index f87e29786621..4ba28821efe3 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -6,30 +6,40 @@
#
PORTNAME= fileroller
-PORTVERSION= 2.8.4
+PORTVERSION= 2.10.0
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/file-roller/2.8
+MASTER_SITE_SUBDIR= sources/file-roller/2.10
DISTNAME= file-roller-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= An archive manager for zip files, tar, etc
+# XXX: We need the ports version of gtar since gtar-1.13.25 included with
+# FreeBSD is not sufficient. If the base version of GNU tar is updated, then
+# we can do away with this dependency.
+RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar
+
USE_BZIP2= yes
-USE_X_PREFIX= yes
INSTALLS_OMF= yes
+USE_X_PREFIX= yes
+USE_REINPLACE= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils
+USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2
USE_LIBTOOL_VER=15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= file-roller.schemas
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${WRKSRC}/src/fr-command-tar.c
+
post-install:
- @-update-desktop-database > /dev/null
+ @-update-desktop-database
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
.for f in AUTHORS NEWS README TODO
diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo
index 924432cded1e..97e96af0d99b 100644
--- a/archivers/fileroller/distinfo
+++ b/archivers/fileroller/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/file-roller-2.8.4.tar.bz2) = deabb6d24152457cf0afc036358602d4
-SIZE (gnome2/file-roller-2.8.4.tar.bz2) = 1410279
+MD5 (gnome2/file-roller-2.10.0.tar.bz2) = 0cb5b09aad7c9d352922994a6e8cf088
+SIZE (gnome2/file-roller-2.10.0.tar.bz2) = 1311026
diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c
index ea69f1180a69..ea0addced05c 100644
--- a/archivers/fileroller/files/patch-src_fr-command-tar.c
+++ b/archivers/fileroller/files/patch-src_fr-command-tar.c
@@ -1,73 +1,11 @@
---- src/fr-command-tar.c.orig Mon Apr 19 15:10:23 2004
-+++ src/fr-command-tar.c Tue Apr 20 02:15:36 2004
-@@ -226,6 +226,11 @@
- return g_strdup (f_start);
- }
+--- src/fr-command-tar.c.orig Sun Feb 20 17:17:15 2005
++++ src/fr-command-tar.c Sun Feb 20 17:19:07 2005
+@@ -219,7 +219,7 @@
+ /* In solaris gtar is present under /usr/sfw/bin */
-+static char *months[] = {
-+ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
-+ "Nov", "Dec"
-+};
-+
+ prev_path = g_getenv ("PATH");
+- temp = g_strdup_printf ("PATH=%s:%s", prev_path, "/usr/sfw/bin");
++ temp = g_strdup_printf ("PATH=%s:%s:%s", "%%LOCALBASE%%/bin", prev_path, "/usr/sfw/bin");
+ putenv (temp);
- static void
- process_line (char *line,
-@@ -234,28 +239,37 @@
- FileData *fdata;
- FRCommand *comm = FR_COMMAND (data);
- char **fields;
-- int date_idx;
-- char *field_date, *field_time, *field_size, *field_name;
-+ int i;
-+ struct tm tm = {0, };
-+ char **time_fields;
-+ const char *field_name;
-
- g_return_if_fail (line != NULL);
-
- fdata = file_data_new ();
-
-- date_idx = get_index_from_pattern (line, "%n%n%n%n-%n%n-%n%n %n%n:%n%n");
-+ fields = split_line (line, 7);
-+
-+ fdata->size = atol (fields[2]);
-+ for (i = 0; i < 12; i++) {
-+ if (!strncmp(fields[3], months[i], 3)) break;
-+ }
-
-- field_size = get_prev_field (line, date_idx, 1);
-- fdata->size = atol (field_size);
-- g_free (field_size);
--
-- field_date = get_next_field (line, date_idx, 1);
-- field_time = get_next_field (line, date_idx, 2);
-- fdata->modified = mktime_from_string (field_date, field_time);
-- g_free (field_date);
-- g_free (field_time);
-+ tm.tm_mon = i;
-+ tm.tm_year = atoi (fields[6]) - 1900;
-+ tm.tm_mday = atoi (fields[4]);
-+ time_fields = g_strsplit(fields[5], ":", 2);
-+ tm.tm_hour = atoi (time_fields[0]);
-+ tm.tm_min = atoi (time_fields[1]);
-+ tm.tm_sec = 0;
-+ tm.tm_isdst = -1;
-+ fdata->modified = mktime(&tm);
-+ g_strfreev (fields);
-+ g_strfreev (time_fields);
-
- /* Full path */
-
-- field_name = tar_get_last_field (line, date_idx, 3);
-+ field_name = get_last_field (line, 8);
- fields = g_strsplit (field_name, " -> ", 2);
-
- if (fields[1] == NULL) {
-@@ -274,7 +288,6 @@
- if (fields[1] != NULL)
- fdata->link = g_strdup (fields[1]);
- g_strfreev (fields);
-- g_free (field_name);
-
- fdata->name = g_strdup (file_name_from_path (fdata->full_path));
- fdata->path = remove_level_from_path (fdata->full_path);
+ path = g_find_program_in_path ("gtar");
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index 187b11b08251..139cdaa0f85b 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -1,5 +1,6 @@
bin/file-roller
lib/bonobo/libfile-roller-component.so
+lib/nautilus/extensions-1.0/libnautilus-fileroller.so
libdata/bonobo/servers/File_Roller_Component.server
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -47,10 +48,11 @@ share/gnome/help/file-roller/ru/legal.xml
share/gnome/help/file-roller/sv/figures/file-roller_main_window.png
share/gnome/help/file-roller/sv/file-roller.xml
share/gnome/help/file-roller/sv/legal.xml
-share/gnome/help/file-roller/uk/figures/fr-add-dialog.png
-share/gnome/help/file-roller/uk/figures/fr-extract.png
-share/gnome/help/file-roller/uk/figures/fr-mainwindow.png
-share/gnome/help/file-roller/uk/figures/fr-prefs.png
+share/gnome/help/file-roller/uk/figures/file-roller_home.png
+share/gnome/help/file-roller/uk/figures/file-roller_leftarrow.png
+share/gnome/help/file-roller/uk/figures/file-roller_main_window.png
+share/gnome/help/file-roller/uk/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/uk/figures/file-roller_uparrow.png
share/gnome/help/file-roller/uk/file-roller.xml
share/gnome/help/file-roller/uk/legal.xml
share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png
@@ -141,6 +143,7 @@ share/locale/tk/LC_MESSAGES/file-roller.mo
share/locale/tr/LC_MESSAGES/file-roller.mo
share/locale/uk/LC_MESSAGES/file-roller.mo
share/locale/vi/LC_MESSAGES/file-roller.mo
+share/locale/xh/LC_MESSAGES/file-roller.mo
share/locale/zh_CN/LC_MESSAGES/file-roller.mo
share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/omf/file-roller
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 7da933a5a0cf..ff31e07e5ee3 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gnomemedia2
-PORTVERSION= 2.8.0
-PORTREVISION= 4
+PORTVERSION= 2.10.0
+PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-media/2.8
+MASTER_SITE_SUBDIR= sources/gnome-media/2.10
DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -18,15 +18,15 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Multimedia applications for the GNOME 2 desktop
USE_BZIP2= yes
+INSTALLS_OMF= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_LIBTOOL_VER=15
-INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomedesktop \
- gail
+USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \
+ gail nautiluscdburner
USE_GSTREAMER= esound cdparanoia
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index 57f2938ee07f..10edadbbab8a 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-media-2.8.0.tar.bz2) = c200cb577be1adb6bedb8c6528d738a1
-SIZE (gnome2/gnome-media-2.8.0.tar.bz2) = 3171171
+MD5 (gnome2/gnome-media-2.10.0.tar.bz2) = e3b5a422881bfcb7f4082818075e8c88
+SIZE (gnome2/gnome-media-2.10.0.tar.bz2) = 3286571
diff --git a/audio/gnome-media/files/patch-cddb-slave2_tcp.c b/audio/gnome-media/files/patch-cddb-slave2_tcp.c
new file mode 100644
index 000000000000..f316b7f01301
--- /dev/null
+++ b/audio/gnome-media/files/patch-cddb-slave2_tcp.c
@@ -0,0 +1,20 @@
+--- cddb-slave2/tcp.c.orig Mon Sep 20 14:52:50 2004
++++ cddb-slave2/tcp.c Sat Mar 12 03:30:52 2005
+@@ -265,7 +265,7 @@ gnet_tcp_socket_new_async (const GInetAd
+ continue;
+
+ sa_in6->sin6_scope_id = ifindex;
+- con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa));
++ con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(sa6));
+ if (con == 0 || errno == EINPROGRESS)
+ break;
+
+@@ -283,7 +283,7 @@ gnet_tcp_socket_new_async (const GInetAd
+ memcpy(&sa, &addr->sa, sizeof(sa));
+ sa_in = (struct sockaddr_in *) &sa;
+ sa_in->sin_family = AF_INET;
+- con = connect(s->sockfd, &sa, sizeof(s->sa));
++ con = connect(s->sockfd, &sa, sizeof(sa));
+ }
+
+ /* Connect (but non-blocking!) */
diff --git a/audio/gnome-media/files/patch-gnome-cd_Makefile.in b/audio/gnome-media/files/patch-gnome-cd_Makefile.in
new file mode 100644
index 000000000000..b534f8fec923
--- /dev/null
+++ b/audio/gnome-media/files/patch-gnome-cd_Makefile.in
@@ -0,0 +1,30 @@
+--- gnome-cd/Makefile.in.orig Sat Mar 12 02:52:17 2005
++++ gnome-cd/Makefile.in Sat Mar 12 03:03:20 2005
+@@ -282,8 +282,8 @@
+ libgnomemedia_cddbslave2_la_SOURCES = $(IDL_GENERATED)
+ @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = solaris-cdrom.c solaris-cdrom.h
+
+-@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c
+-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = bsd-cdrom.c bsd-cdrom.h
++#@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c
++@CDROM_HOST_BSD_TRUE@cd_sources = bsd-cdrom.c bsd-cdrom.h
+ @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = linux-cdrom.c linux-cdrom.h
+
+ bin_PROGRAMS = gnome-cd
+@@ -352,13 +352,13 @@
+ solaris-cdrom.h gst-cdparanoia-cdrom.c bsd-cdrom.c bsd-cdrom.h \
+ linux-cdrom.c linux-cdrom.h preferences.c preferences.h \
+ cd-selection.c cd-selection.h theme.c
+-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \
+-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@ bsd-cdrom.$(OBJEXT)
++@CDROM_HOST_BSD_TRUE@am__objects_2 = \
++@CDROM_HOST_BSD_TRUE@ bsd-cdrom.$(OBJEXT)
+ @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \
+ @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@ linux-cdrom.$(OBJEXT)
+ @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \
+ @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@ solaris-cdrom.$(OBJEXT)
+-@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT)
++#@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT)
+ am_gnome_cd_OBJECTS = eggtrayicon.$(OBJEXT) gnome-cd.$(OBJEXT) \
+ callbacks.$(OBJEXT) cddb.$(OBJEXT) cdrom.$(OBJEXT) \
+ display.$(OBJEXT) $(am__objects_2) preferences.$(OBJEXT) \
diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
new file mode 100644
index 000000000000..4942519dde40
--- /dev/null
+++ b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
@@ -0,0 +1,32 @@
+--- gnome-cd/gst-cdparanoia-cdrom.c.orig Sat Mar 12 00:09:14 2005
++++ gnome-cd/gst-cdparanoia-cdrom.c Sat Mar 12 00:19:15 2005
+@@ -1443,15 +1443,18 @@
+ return FALSE;
+ }
+
++#if !defined(__FreeBSD__)
++ /* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM
++ * device.
++ */
++
+ fd = open (device, O_RDONLY | O_NONBLOCK);
+ if (fd < 0) {
+ return FALSE;
+ }
+
+ /* Fire a harmless ioctl at the device. */
+-#if defined(__FreeBSD__)
+- if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) {
+-#elif defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__)
+ if (ioctl (fd, CDIOCGETVOL, 0) < 0) {
+ #else
+ if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) {
+@@ -1463,6 +1466,7 @@
+ }
+
+ close (fd);
++#endif /* __FreeBSD__ */
+
+ return TRUE;
+ }
diff --git a/audio/gnome-media/files/patch-grecord_gsr-window.c b/audio/gnome-media/files/patch-grecord_gsr-window.c
deleted file mode 100644
index c26eb6889094..000000000000
--- a/audio/gnome-media/files/patch-grecord_gsr-window.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- grecord/src/gsr-window.c.orig Fri Dec 24 15:16:11 2004
-+++ grecord/src/gsr-window.c Fri Dec 24 15:16:13 2004
-@@ -29,7 +29,7 @@
- #include <unistd.h>
-
- #include <gnome.h>
--#include <libgnomevfs/gnome-vfs-utils.h>
-+#include <libgnomevfs/gnome-vfs.h>
- #include <gconf/gconf-client.h>
- #include <gst/gst.h>
- #include <gst/gconf/gconf.h>
-@@ -475,16 +475,41 @@
- {
- GSRWindowPrivate *priv;
- GMAudioProfile *profile;
-- char *tmp;
-+ char *tmp, *src;
-+ GnomeVFSURI *src_uri, *dst_uri;
-
- priv = window->priv;
-
- profile = gm_audio_profile_choose_get_active (priv->profile);
-
-- tmp = g_strdup_printf ("%s.%s", name,
-+ tmp = g_strdup_printf ("file://%s.%s", name,
- gm_audio_profile_get_extension (profile));
-- rename (priv->record_filename, tmp);
-- g_free (tmp);
-+ src = g_strdup_printf ("file://%s", priv->record_filename);
-+ src_uri = gnome_vfs_uri_new (src);
-+ dst_uri = gnome_vfs_uri_new (tmp);
-+ g_free (src);
-+ g_free (tmp);
-+ if (src_uri && dst_uri) {
-+ GnomeVFSResult result;
-+ result = gnome_vfs_xfer_uri (src_uri, dst_uri,
-+ GNOME_VFS_XFER_DEFAULT,
-+ GNOME_VFS_XFER_ERROR_MODE_ABORT,
-+ GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
-+ NULL, NULL);
-+ if (result == GNOME_VFS_OK) {
-+ char *title, *short_name;
-+ priv->filename = g_strdup_printf ("%s.%s",
-+ name, gm_audio_profile_get_extension (profile));
-+ short_name = g_path_get_basename (priv->filename);
-+ title = g_strdup_printf ("%s - Sound Recorder",
-+ short_name);
-+ gtk_window_set_title (GTK_WINDOW (window), title);
-+ priv->dirty = FALSE;
-+ g_free (title);
-+ }
-+ gnome_vfs_uri_unref (src_uri);
-+ gnome_vfs_uri_unref (dst_uri);
-+ }
- }
-
- static void
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index a80344126abe..42fabcc9a822 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -22,16 +22,24 @@ libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server
libdata/pkgconfig/gnome-media-profiles.pc
libexec/CDDBSlave2
libexec/cddb-track-editor
+share/gnome/applications/cddb-slave.desktop
share/gnome/applications/gnome-cd.desktop
share/gnome/applications/gnome-sound-recorder.desktop
share/gnome/applications/gnome-volume-control.desktop
+share/gnome/applications/gstreamer-properties.desktop
share/gnome/applications/reclevel.desktop
share/gnome/applications/vumeter.desktop
-share/gnome/control-center-2.0/capplets/cddb-slave.desktop
-share/gnome/control-center-2.0/capplets/gstreamer-properties.desktop
share/gnome/gnome-media/glade/gnome-audio-profiles.glade2
+share/gnome/gnome-media/pixmaps/3dsound.png
+share/gnome/gnome-media/pixmaps/chain-broken.png
+share/gnome/gnome-media/pixmaps/chain.png
+share/gnome/gnome-media/pixmaps/headphones.png
share/gnome/gnome-media/pixmaps/mixer.png
+share/gnome/gnome-media/pixmaps/noplay.png
+share/gnome/gnome-media/pixmaps/norecord.png
share/gnome/gnome-media/pixmaps/phone.png
+share/gnome/gnome-media/pixmaps/play.png
+share/gnome/gnome-media/pixmaps/record.png
share/gnome/gnome-media/pixmaps/tone.png
share/gnome/gnome-media/pixmaps/video.png
share/gnome/gnome-sound-recorder/ui/gsr.xml
@@ -434,6 +442,7 @@ share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo
share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
share/locale/nb/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-media-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
share/locale/no/LC_MESSAGES/gnome-media-2.0.mo
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 7da933a5a0cf..ff31e07e5ee3 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gnomemedia2
-PORTVERSION= 2.8.0
-PORTREVISION= 4
+PORTVERSION= 2.10.0
+PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-media/2.8
+MASTER_SITE_SUBDIR= sources/gnome-media/2.10
DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -18,15 +18,15 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Multimedia applications for the GNOME 2 desktop
USE_BZIP2= yes
+INSTALLS_OMF= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_LIBTOOL_VER=15
-INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomedesktop \
- gail
+USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \
+ gail nautiluscdburner
USE_GSTREAMER= esound cdparanoia
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
index 57f2938ee07f..10edadbbab8a 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-media-2.8.0.tar.bz2) = c200cb577be1adb6bedb8c6528d738a1
-SIZE (gnome2/gnome-media-2.8.0.tar.bz2) = 3171171
+MD5 (gnome2/gnome-media-2.10.0.tar.bz2) = e3b5a422881bfcb7f4082818075e8c88
+SIZE (gnome2/gnome-media-2.10.0.tar.bz2) = 3286571
diff --git a/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c b/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c
new file mode 100644
index 000000000000..f316b7f01301
--- /dev/null
+++ b/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c
@@ -0,0 +1,20 @@
+--- cddb-slave2/tcp.c.orig Mon Sep 20 14:52:50 2004
++++ cddb-slave2/tcp.c Sat Mar 12 03:30:52 2005
+@@ -265,7 +265,7 @@ gnet_tcp_socket_new_async (const GInetAd
+ continue;
+
+ sa_in6->sin6_scope_id = ifindex;
+- con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa));
++ con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(sa6));
+ if (con == 0 || errno == EINPROGRESS)
+ break;
+
+@@ -283,7 +283,7 @@ gnet_tcp_socket_new_async (const GInetAd
+ memcpy(&sa, &addr->sa, sizeof(sa));
+ sa_in = (struct sockaddr_in *) &sa;
+ sa_in->sin_family = AF_INET;
+- con = connect(s->sockfd, &sa, sizeof(s->sa));
++ con = connect(s->sockfd, &sa, sizeof(sa));
+ }
+
+ /* Connect (but non-blocking!) */
diff --git a/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in b/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in
new file mode 100644
index 000000000000..b534f8fec923
--- /dev/null
+++ b/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in
@@ -0,0 +1,30 @@
+--- gnome-cd/Makefile.in.orig Sat Mar 12 02:52:17 2005
++++ gnome-cd/Makefile.in Sat Mar 12 03:03:20 2005
+@@ -282,8 +282,8 @@
+ libgnomemedia_cddbslave2_la_SOURCES = $(IDL_GENERATED)
+ @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = solaris-cdrom.c solaris-cdrom.h
+
+-@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c
+-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = bsd-cdrom.c bsd-cdrom.h
++#@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c
++@CDROM_HOST_BSD_TRUE@cd_sources = bsd-cdrom.c bsd-cdrom.h
+ @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = linux-cdrom.c linux-cdrom.h
+
+ bin_PROGRAMS = gnome-cd
+@@ -352,13 +352,13 @@
+ solaris-cdrom.h gst-cdparanoia-cdrom.c bsd-cdrom.c bsd-cdrom.h \
+ linux-cdrom.c linux-cdrom.h preferences.c preferences.h \
+ cd-selection.c cd-selection.h theme.c
+-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \
+-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@ bsd-cdrom.$(OBJEXT)
++@CDROM_HOST_BSD_TRUE@am__objects_2 = \
++@CDROM_HOST_BSD_TRUE@ bsd-cdrom.$(OBJEXT)
+ @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \
+ @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@ linux-cdrom.$(OBJEXT)
+ @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \
+ @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@ solaris-cdrom.$(OBJEXT)
+-@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT)
++#@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT)
+ am_gnome_cd_OBJECTS = eggtrayicon.$(OBJEXT) gnome-cd.$(OBJEXT) \
+ callbacks.$(OBJEXT) cddb.$(OBJEXT) cdrom.$(OBJEXT) \
+ display.$(OBJEXT) $(am__objects_2) preferences.$(OBJEXT) \
diff --git a/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
new file mode 100644
index 000000000000..4942519dde40
--- /dev/null
+++ b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
@@ -0,0 +1,32 @@
+--- gnome-cd/gst-cdparanoia-cdrom.c.orig Sat Mar 12 00:09:14 2005
++++ gnome-cd/gst-cdparanoia-cdrom.c Sat Mar 12 00:19:15 2005
+@@ -1443,15 +1443,18 @@
+ return FALSE;
+ }
+
++#if !defined(__FreeBSD__)
++ /* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM
++ * device.
++ */
++
+ fd = open (device, O_RDONLY | O_NONBLOCK);
+ if (fd < 0) {
+ return FALSE;
+ }
+
+ /* Fire a harmless ioctl at the device. */
+-#if defined(__FreeBSD__)
+- if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) {
+-#elif defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__)
+ if (ioctl (fd, CDIOCGETVOL, 0) < 0) {
+ #else
+ if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) {
+@@ -1463,6 +1466,7 @@
+ }
+
+ close (fd);
++#endif /* __FreeBSD__ */
+
+ return TRUE;
+ }
diff --git a/audio/gnomemedia2/files/patch-grecord_gsr-window.c b/audio/gnomemedia2/files/patch-grecord_gsr-window.c
deleted file mode 100644
index c26eb6889094..000000000000
--- a/audio/gnomemedia2/files/patch-grecord_gsr-window.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- grecord/src/gsr-window.c.orig Fri Dec 24 15:16:11 2004
-+++ grecord/src/gsr-window.c Fri Dec 24 15:16:13 2004
-@@ -29,7 +29,7 @@
- #include <unistd.h>
-
- #include <gnome.h>
--#include <libgnomevfs/gnome-vfs-utils.h>
-+#include <libgnomevfs/gnome-vfs.h>
- #include <gconf/gconf-client.h>
- #include <gst/gst.h>
- #include <gst/gconf/gconf.h>
-@@ -475,16 +475,41 @@
- {
- GSRWindowPrivate *priv;
- GMAudioProfile *profile;
-- char *tmp;
-+ char *tmp, *src;
-+ GnomeVFSURI *src_uri, *dst_uri;
-
- priv = window->priv;
-
- profile = gm_audio_profile_choose_get_active (priv->profile);
-
-- tmp = g_strdup_printf ("%s.%s", name,
-+ tmp = g_strdup_printf ("file://%s.%s", name,
- gm_audio_profile_get_extension (profile));
-- rename (priv->record_filename, tmp);
-- g_free (tmp);
-+ src = g_strdup_printf ("file://%s", priv->record_filename);
-+ src_uri = gnome_vfs_uri_new (src);
-+ dst_uri = gnome_vfs_uri_new (tmp);
-+ g_free (src);
-+ g_free (tmp);
-+ if (src_uri && dst_uri) {
-+ GnomeVFSResult result;
-+ result = gnome_vfs_xfer_uri (src_uri, dst_uri,
-+ GNOME_VFS_XFER_DEFAULT,
-+ GNOME_VFS_XFER_ERROR_MODE_ABORT,
-+ GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
-+ NULL, NULL);
-+ if (result == GNOME_VFS_OK) {
-+ char *title, *short_name;
-+ priv->filename = g_strdup_printf ("%s.%s",
-+ name, gm_audio_profile_get_extension (profile));
-+ short_name = g_path_get_basename (priv->filename);
-+ title = g_strdup_printf ("%s - Sound Recorder",
-+ short_name);
-+ gtk_window_set_title (GTK_WINDOW (window), title);
-+ priv->dirty = FALSE;
-+ g_free (title);
-+ }
-+ gnome_vfs_uri_unref (src_uri);
-+ gnome_vfs_uri_unref (dst_uri);
-+ }
- }
-
- static void
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index a80344126abe..42fabcc9a822 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -22,16 +22,24 @@ libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server
libdata/pkgconfig/gnome-media-profiles.pc
libexec/CDDBSlave2
libexec/cddb-track-editor
+share/gnome/applications/cddb-slave.desktop
share/gnome/applications/gnome-cd.desktop
share/gnome/applications/gnome-sound-recorder.desktop
share/gnome/applications/gnome-volume-control.desktop
+share/gnome/applications/gstreamer-properties.desktop
share/gnome/applications/reclevel.desktop
share/gnome/applications/vumeter.desktop
-share/gnome/control-center-2.0/capplets/cddb-slave.desktop
-share/gnome/control-center-2.0/capplets/gstreamer-properties.desktop
share/gnome/gnome-media/glade/gnome-audio-profiles.glade2
+share/gnome/gnome-media/pixmaps/3dsound.png
+share/gnome/gnome-media/pixmaps/chain-broken.png
+share/gnome/gnome-media/pixmaps/chain.png
+share/gnome/gnome-media/pixmaps/headphones.png
share/gnome/gnome-media/pixmaps/mixer.png
+share/gnome/gnome-media/pixmaps/noplay.png
+share/gnome/gnome-media/pixmaps/norecord.png
share/gnome/gnome-media/pixmaps/phone.png
+share/gnome/gnome-media/pixmaps/play.png
+share/gnome/gnome-media/pixmaps/record.png
share/gnome/gnome-media/pixmaps/tone.png
share/gnome/gnome-media/pixmaps/video.png
share/gnome/gnome-sound-recorder/ui/gsr.xml
@@ -434,6 +442,7 @@ share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo
share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
share/locale/nb/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-media-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
share/locale/no/LC_MESSAGES/gnome-media-2.0.mo
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 1c4baeb4411c..1796cc0cf6c0 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= sound-juicer
-PORTVERSION= 0.6.0
-PORTREVISION= 2
+PORTVERSION= 2.10.0
CATEGORIES= audio gnome
-MASTER_SITES= http://www.burtonini.com/computing/
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -18,14 +18,17 @@ COMMENT= Clean, mean and lean CD ripper for GNOME2
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2
+USE_BZIP2= yes
USE_X_PREFIX= yes
-INSTALLS_OMF= yes
USE_GMAKE= yes
+INSTALLS_OMF= yes
USE_REINPLACE= yes
-USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui
+USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner
USE_GSTREAMER= cdparanoia vorbis flac
USE_LIBTOOL_VER=15
CONFIGURE_ARGS= --enable-ignore-missing-cd
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= sound-juicer.schemas
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 49ba9dee4363..b235ee6b29aa 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/sound-juicer-0.6.0.tar.gz) = bab9ac8e3f0ba66f360485aafdd379f8
-SIZE (gnome2/sound-juicer-0.6.0.tar.gz) = 597829
+MD5 (gnome2/sound-juicer-2.10.0.tar.bz2) = 2450626f15847d922e47781e3e259b83
+SIZE (gnome2/sound-juicer-2.10.0.tar.bz2) = 503090
diff --git a/audio/sound-juicer/files/patch-src::bacon-cd-selection.c b/audio/sound-juicer/files/patch-src::bacon-cd-selection.c
deleted file mode 100644
index 3bf5d559e3a5..000000000000
--- a/audio/sound-juicer/files/patch-src::bacon-cd-selection.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/bacon-cd-selection.c.orig Sun Dec 12 10:27:00 2004
-+++ src/bacon-cd-selection.c Sun Dec 12 10:27:57 2004
-@@ -179,10 +179,10 @@
- static void
- bacon_cd_selection_init (BaconCdSelection *bcs)
- {
-- bcs->priv = g_new0 (BaconCdSelectionPrivate, 1);
--
- GtkCellRenderer *cell;
- GtkListStore *store;
-+
-+ bcs->priv = g_new0 (BaconCdSelectionPrivate, 1);
-
- store = gtk_list_store_new (1, G_TYPE_STRING);
- gtk_combo_box_set_model (GTK_COMBO_BOX (bcs),
diff --git a/audio/sound-juicer/files/patch-src::cd-drive.c b/audio/sound-juicer/files/patch-src::cd-drive.c
deleted file mode 100644
index 56d594fb962f..000000000000
--- a/audio/sound-juicer/files/patch-src::cd-drive.c
+++ /dev/null
@@ -1,103 +0,0 @@
---- src/cd-drive.c.orig Sun Dec 12 01:39:32 2004
-+++ src/cd-drive.c Sun Dec 12 01:41:50 2004
-@@ -596,7 +596,49 @@
-
- #if defined(__linux__) || defined(__FreeBSD__)
-
-+#if !defined(__linux)
-+static int
-+get_device_max_read_speed (char *device)
-+{
-+ int fd;
-+ int max_speed;
-+ int read_speed, write_speed;
-+
-+ max_speed = -1;
-+
-+ fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
-+ if (fd < 0) {
-+ return -1;
-+ }
-
-+ get_read_write_speed (fd, &read_speed, &write_speed);
-+ close (fd);
-+ max_speed = (int)floor (read_speed) / CD_ROM_SPEED;
-+
-+ return max_speed;
-+}
-+#endif
-+
-+static int
-+get_device_max_write_speed (char *device)
-+{
-+ int fd;
-+ int max_speed;
-+ int read_speed, write_speed;
-+
-+ max_speed = -1;
-+
-+ fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
-+ if (fd < 0) {
-+ return -1;
-+ }
-+
-+ get_read_write_speed (fd, &read_speed, &write_speed);
-+ close (fd);
-+ max_speed = (int)floor (write_speed) / CD_ROM_SPEED;
-+
-+ return max_speed;
-+}
-
- #endif /* __linux__ || __FreeBSD__ */
-
-@@ -798,50 +840,6 @@
- }
- }
- return NULL;
--}
--
--#if !defined(__linux)
--static int
--get_device_max_read_speed (char *device)
--{
-- int fd;
-- int max_speed;
-- int read_speed, write_speed;
--
-- max_speed = -1;
--
-- fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
-- if (fd < 0) {
-- return -1;
-- }
--
-- get_read_write_speed (fd, &read_speed, &write_speed);
-- close (fd);
-- max_speed = (int)floor (read_speed) / CD_ROM_SPEED;
--
-- return max_speed;
--}
--#endif
--
--static int
--get_device_max_write_speed (char *device)
--{
-- int fd;
-- int max_speed;
-- int read_speed, write_speed;
--
-- max_speed = -1;
--
-- fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
-- if (fd < 0) {
-- return -1;
-- }
--
-- get_read_write_speed (fd, &read_speed, &write_speed);
-- close (fd);
-- max_speed = (int)floor (write_speed) / CD_ROM_SPEED;
--
-- return max_speed;
- }
-
- static char *
diff --git a/audio/sound-juicer/files/patch-src::sj-genres.c b/audio/sound-juicer/files/patch-src::sj-genres.c
new file mode 100644
index 000000000000..5bbf888cbed3
--- /dev/null
+++ b/audio/sound-juicer/files/patch-src::sj-genres.c
@@ -0,0 +1,13 @@
+--- src/sj-genres.c.orig Mon Jan 17 13:22:28 2005
++++ src/sj-genres.c Mon Jan 17 13:22:34 2005
+@@ -20,9 +20,9 @@
+ * Authors: Ross Burton <ross@burtonini.com>
+ */
+
+-#include "sound-juicer.h"
+
+ #include <glib/gi18n.h>
++#include "sound-juicer.h"
+
+ #include "sj-genres.h"
+
diff --git a/audio/sound-juicer/files/patch-src::sj-main.c b/audio/sound-juicer/files/patch-src::sj-main.c
deleted file mode 100644
index 547e5c245d67..000000000000
--- a/audio/sound-juicer/files/patch-src::sj-main.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/sj-main.c.orig Tue Jun 15 19:45:05 2004
-+++ src/sj-main.c Tue Jun 15 19:46:13 2004
-@@ -535,8 +535,9 @@
- */
- void device_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
- {
-- g_assert (strcmp (entry->key, GCONF_DEVICE) == 0);
- gboolean ignore_no_media = GPOINTER_TO_INT (user_data);
-+
-+ g_assert (strcmp (entry->key, GCONF_DEVICE) == 0);
-
- if (entry->value == NULL
- || !cd_drive_exists (gconf_value_get_string (entry->value))) {
diff --git a/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c b/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c
new file mode 100644
index 000000000000..c510a48dc6f4
--- /dev/null
+++ b/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c
@@ -0,0 +1,18 @@
+--- src/sj-metadata-musicbrainz.c.orig Mon Jan 17 13:22:54 2005
++++ src/sj-metadata-musicbrainz.c Mon Jan 17 13:23:02 2005
+@@ -18,7 +18,6 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include "sound-juicer.h"
+
+ #include <string.h>
+ #include <glib-object.h>
+@@ -32,6 +31,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+
++#include "sound-juicer.h"
+ #include "sj-metadata-musicbrainz.h"
+ #include "sj-structures.h"
+ #include "sj-error.h"
diff --git a/audio/sound-juicer/files/patch-src::sj-util.c b/audio/sound-juicer/files/patch-src::sj-util.c
index feea811fcebb..b29d97bbd4f9 100644
--- a/audio/sound-juicer/files/patch-src::sj-util.c
+++ b/audio/sound-juicer/files/patch-src::sj-util.c
@@ -1,71 +1,43 @@
---- src/sj-util.c.orig Tue Jun 15 19:14:09 2004
-+++ src/sj-util.c Tue Jun 15 19:29:16 2004
-@@ -122,6 +122,9 @@
- gtk_widget_destroy (dialog);
- goto done;
- }
-+#ifdef __FreeBSD__
-+ ioctl (fd, CDIOCALLOW);
-+#endif
- result = ioctl (fd, CDROMEJECT);
- if (result == -1) {
- GtkWidget *dialog;
-@@ -151,20 +154,32 @@
- {
- int fd, status;
-
-+#if defined(__linux__)
- fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL);
+--- src/sj-util.c.orig Tue Feb 8 14:06:57 2005
++++ src/sj-util.c Tue Feb 8 14:25:03 2005
+@@ -157,6 +157,15 @@
if (fd < 0) {
return FALSE;
}
++#if defined(__FreeBSD__)
++ status = FALSE;
++
++ ioctl (fd, CDIOCCLOSE);
++
++ close (fd);
++
++ return status;
++#else
status = ioctl (fd, CDROM_DRIVE_STATUS, CDSL_CURRENT);
-+ close (fd);
if (status < 0) {
-- close (fd);
- return FALSE;
- }
+@@ -167,6 +176,7 @@
+ close (fd);
-- close (fd);
--
return status == CDS_TRAY_OPEN;
-+#elif defined(__FreeBSD__)
-+ struct ioc_toc_header h;
-+
-+ fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL);
-+ if (fd < 0) {
-+ return FALSE;
-+ }
-+
-+ status = ioctl (fd, CDIOREADTOCHEADER, &h);
-+ close (fd);
-+
-+ return status < 0;
+#endif
}
gboolean is_audio_cd (const char *device)
-@@ -191,15 +210,19 @@
- return FALSE;
+@@ -191,7 +201,7 @@
+ default:
+ return FALSE;
}
-
-+#if defined(__linux__)
- status = ioctl (fd, CDROM_DISC_STATUS, CDSL_CURRENT);
-+ close (fd);
- if (status < 0) {
-- close (fd);
+-
++/*
+ fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL);
+ if (fd <0) {
return FALSE;
- }
+@@ -206,6 +216,7 @@
+ close (fd);
-- close (fd);
--
return status == CDS_AUDIO;
-+#elif defined (__FreeBSD__)
-+ return TRUE;
-+#else
-+ return TRUE;
-+#endif
++ */
}
/* Pass NULL to use g_free */
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index af60b4f7cc77..bab1ce85bba4 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -9,6 +9,51 @@ share/gnome/omf/sound-juicer/sound-juicer-manual-C.omf
share/gnome/pixmaps/sound-juicer.png
share/gnome/sound-juicer/orange-slice.png
share/gnome/sound-juicer/sound-juicer.glade
+share/locale/ar/LC_MESSAGES/sound-juicer.mo
+share/locale/az/LC_MESSAGES/sound-juicer.mo
+share/locale/be/LC_MESSAGES/sound-juicer.mo
+share/locale/bg/LC_MESSAGES/sound-juicer.mo
+share/locale/ca/LC_MESSAGES/sound-juicer.mo
+share/locale/cs/LC_MESSAGES/sound-juicer.mo
+share/locale/da/LC_MESSAGES/sound-juicer.mo
+share/locale/de/LC_MESSAGES/sound-juicer.mo
+share/locale/el/LC_MESSAGES/sound-juicer.mo
+share/locale/en_CA/LC_MESSAGES/sound-juicer.mo
+share/locale/en_GB/LC_MESSAGES/sound-juicer.mo
+share/locale/es/LC_MESSAGES/sound-juicer.mo
+share/locale/et/LC_MESSAGES/sound-juicer.mo
+share/locale/eu/LC_MESSAGES/sound-juicer.mo
+share/locale/fi/LC_MESSAGES/sound-juicer.mo
+share/locale/fr/LC_MESSAGES/sound-juicer.mo
+share/locale/gu/LC_MESSAGES/sound-juicer.mo
+share/locale/hi/LC_MESSAGES/sound-juicer.mo
+share/locale/hr/LC_MESSAGES/sound-juicer.mo
+share/locale/hu/LC_MESSAGES/sound-juicer.mo
+share/locale/it/LC_MESSAGES/sound-juicer.mo
+share/locale/ja/LC_MESSAGES/sound-juicer.mo
+share/locale/ko/LC_MESSAGES/sound-juicer.mo
+share/locale/lt/LC_MESSAGES/sound-juicer.mo
+share/locale/mk/LC_MESSAGES/sound-juicer.mo
+share/locale/ml/LC_MESSAGES/sound-juicer.mo
+share/locale/ms/LC_MESSAGES/sound-juicer.mo
+share/locale/nb/LC_MESSAGES/sound-juicer.mo
+share/locale/ne/LC_MESSAGES/sound-juicer.mo
+share/locale/nl/LC_MESSAGES/sound-juicer.mo
+share/locale/no/LC_MESSAGES/sound-juicer.mo
+share/locale/pa/LC_MESSAGES/sound-juicer.mo
+share/locale/pl/LC_MESSAGES/sound-juicer.mo
+share/locale/pt/LC_MESSAGES/sound-juicer.mo
+share/locale/pt_BR/LC_MESSAGES/sound-juicer.mo
+share/locale/ru/LC_MESSAGES/sound-juicer.mo
+share/locale/sq/LC_MESSAGES/sound-juicer.mo
+share/locale/sr/LC_MESSAGES/sound-juicer.mo
+share/locale/sr@Latn/LC_MESSAGES/sound-juicer.mo
+share/locale/sv/LC_MESSAGES/sound-juicer.mo
+share/locale/th/LC_MESSAGES/sound-juicer.mo
+share/locale/tr/LC_MESSAGES/sound-juicer.mo
+share/locale/uk/LC_MESSAGES/sound-juicer.mo
+share/locale/zh_CN/LC_MESSAGES/sound-juicer.mo
+share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
@dirrm share/gnome/sound-juicer
@dirrm share/gnome/omf/sound-juicer
@dirrm share/gnome/help/sound-juicer/C/figures
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index e3265639e59b..f7a5fde2ecf1 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -6,38 +6,50 @@
#
PORTNAME= evolution-data-server
-PORTVERSION= 1.0.4
+PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= The data backends for the Evolution integrated mail/PIM suite
-LIB_DEPENDS= soup-2.2.7:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS= soup-2.2.7:${PORTSDIR}/devel/libsoup \
+ nss3.1:${PORTSDIR}/security/nss
USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnome
+USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnomeui
USE_REINPLACE= yes
USE_LIBTOOL_VER=15
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --enable-static
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-PLIST_SUB= VERSION="1.0" EVO_VERSION="1.0"
+CONFIGURE_ARGS= --enable-static \
+ --enable-nss=yes \
+ --with-nss-includes=${LOCALBASE}/include/nss/nss \
+ --with-nss-libs=${LOCALBASE}/lib \
+ --with-nspr-includes=${LOCALBASE}/include/nspr \
+ --with-nspr-libs=${LOCALBASE}/lib \
+ --with-krb5=/usr
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+
+PLIST_SUB= VERSION="1.2" EVO_VERSION="1.2"
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 600012
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libedataserver_e-msgport.c
+.endif
.if !defined(WITHOUT_LDAP)
USE_OPENLDAP= yes
CONFIGURE_ARGS+=--with-openldap=yes
-PLIST_SUB+= LDAP=""
.else
CONFIGURE_ARGS+=--with-openldap=no
-PLIST_SUB+= LDAP="@comment "
.endif
pre-everything::
@@ -46,4 +58,4 @@ pre-everything::
@${ECHO_MSG} " WITHOUT_LDAP Disable LDAP support"
@${ECHO_MSG} ""
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index fc9fd81d63a0..6ac9d80baf96 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-data-server-1.0.4.tar.bz2) = 5c9c6cac9b65d392e50ea3214022cb5b
-SIZE (gnome2/evolution-data-server-1.0.4.tar.bz2) = 4792220
+MD5 (gnome2/evolution-data-server-1.2.0.tar.bz2) = 9a34499dc8e65af768ab1582803015ef
+SIZE (gnome2/evolution-data-server-1.2.0.tar.bz2) = 7427456
diff --git a/mail/evolution/files/patch-e-util_e-msgport.c b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c
index 85bd48595b3d..7383f939f4cd 100644
--- a/mail/evolution/files/patch-e-util_e-msgport.c
+++ b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c
@@ -1,6 +1,6 @@
---- e-util/e-msgport.c.orig Wed Jan 14 00:04:04 2004
-+++ e-util/e-msgport.c Sun Sep 19 14:01:25 2004
-@@ -921,9 +921,13 @@
+--- libedataserver/e-msgport.c.orig Thu Dec 2 22:33:06 2004
++++ libedataserver/e-msgport.c Wed Mar 9 14:31:46 2005
+@@ -921,9 +921,18 @@
void e_thread_put(EThread *e, EMsg *msg)
{
pthread_t id;
@@ -9,12 +9,17 @@
pthread_mutex_lock(&e->mutex);
+ pthread_attr_init(&attr);
-+ /* Give us a 1 MB thread stack size. */
-+ pthread_attr_setstacksize(&attr, 0x100000);
++ /* Give us a 1 MB thread stacksize on 32-bit architectures, and
++ * a 2 MB thread stacksize on 64-bit architectures. */
++ if (sizeof (void *) == 8) {
++ pthread_attr_setstacksize(&attr, 0x200000);
++ } else {
++ pthread_attr_setstacksize(&attr, 0x100000);
++ }
/* the caller forgot to tell us what to do, well, we can't do anything can we */
if (e->received == NULL) {
-@@ -962,13 +966,14 @@
+@@ -962,13 +971,14 @@
e_msgport_put(e->server_port, msg);
if (e->waiting == 0
&& g_list_length(e->id_list) < e->queue_limit
@@ -30,7 +35,7 @@
pthread_mutex_unlock(&e->mutex);
return;
}
-@@ -977,12 +982,13 @@
+@@ -977,12 +987,13 @@
if (e->id == E_THREAD_NONE) {
int err;
diff --git a/databases/evolution-data-server/files/patch-calendar_libical_configure b/databases/evolution-data-server/files/patch-calendar_libical_configure
new file mode 100644
index 000000000000..19028e5d49fc
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-calendar_libical_configure
@@ -0,0 +1,11 @@
+--- calendar/libical/configure.orig Sun Dec 26 16:54:57 2004
++++ calendar/libical/configure Sun Dec 26 16:55:23 2004
+@@ -19736,7 +19736,7 @@
+
+
+
+-if test "x$USE_MAINTAINER_MODE" == xyes; then
++if test "x$USE_MAINTAINER_MODE" = xyes; then
+ DEV="yes"
+ echo "$as_me:$LINENO: result: Setting up for development: -Wall, flex, bison" >&5
+ echo "${ECHO_T}Setting up for development: -Wall, flex, bison" >&6
diff --git a/databases/evolution-data-server/files/patch-camel_Makefile.in b/databases/evolution-data-server/files/patch-camel_Makefile.in
new file mode 100644
index 000000000000..dfd4f33f61e2
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_Makefile.in
@@ -0,0 +1,11 @@
+--- camel/Makefile.in.orig Tue Dec 21 13:46:00 2004
++++ camel/Makefile.in Tue Dec 21 13:46:01 2004
+@@ -299,7 +299,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+
+-SUBDIRS = . providers tests
++SUBDIRS = . providers
+
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_in_files = camel.pc.in camel-provider.pc.in
diff --git a/mail/evolution/files/patch-e-util_e-host-utils.c b/databases/evolution-data-server/files/patch-camel_camel-net-utils.c
index 3d92fc70fca2..17bddca39e31 100644
--- a/mail/evolution/files/patch-e-util_e-host-utils.c
+++ b/databases/evolution-data-server/files/patch-camel_camel-net-utils.c
@@ -1,6 +1,6 @@
---- e-util/e-host-utils.c.orig Tue Apr 13 15:19:43 2004
-+++ e-util/e-host-utils.c Sun Oct 3 01:17:57 2004
-@@ -136,12 +136,21 @@
+--- camel/camel-net-utils.c.orig Tue Dec 21 13:38:52 2004
++++ camel/camel-net-utils.c Tue Dec 21 13:40:34 2004
+@@ -143,12 +143,21 @@
case EAI_SERVICE:
return NO_DATA;
break;
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
index 4959297daf85..7bc7a9cdfb65 100644
--- a/databases/evolution-data-server/files/patch-configure
+++ b/databases/evolution-data-server/files/patch-configure
@@ -1,6 +1,36 @@
---- configure.orig Thu Jan 29 16:02:10 2004
-+++ configure Thu Jan 29 16:02:39 2004
-@@ -23783,7 +23783,7 @@
+--- configure.orig Tue Dec 21 13:46:01 2004
++++ configure Tue Dec 21 13:50:02 2004
+@@ -7894,10 +7894,10 @@
+ Example: --with-nspr-libs=/usr/lib" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+- nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
++ nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
+ fi
+ else
+- nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
++ nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
+ fi
+
+ echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
+@@ -10011,6 +10011,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
++ #include <stdio.h>
+
+
+ int
+@@ -10777,7 +10778,7 @@
+ LDFLAGS_save="$LDFLAGS"
+
+ mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
+- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
++ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
+ echo "$as_me:$LINENO: checking for Kerberos 5" >&5
+ echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
+ if test "${ac_cv_lib_kerberos5+set}" = set; then
+@@ -29833,7 +29834,7 @@
idldir="$datadir/idl/evolution-data-server-$BASE_VERSION"
@@ -8,4 +38,4 @@
+serverdir="$prefix/libdata/bonobo/servers"
-
+ extensiondir='${privlibdir}'/extensions
diff --git a/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c b/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c
new file mode 100644
index 000000000000..62532da02471
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c
@@ -0,0 +1,11 @@
+--- libedataserverui/e-source-option-menu.c.orig Tue Nov 23 13:50:14 2004
++++ libedataserverui/e-source-option-menu.c Tue Nov 23 13:50:33 2004
+@@ -24,6 +24,8 @@
+ #include <config.h>
+ #endif
+
++#include <sys/types.h>
++
+ #include <gtk/gtkmenu.h>
+ #include <gtk/gtkmenuitem.h>
+
diff --git a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c
new file mode 100644
index 000000000000..576ecea6ae3c
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c
@@ -0,0 +1,12 @@
+--- servers/groupwise/e-gw-connection.c.orig Tue Mar 8 03:50:29 2005
++++ servers/groupwise/e-gw-connection.c Tue Mar 8 03:50:40 2005
+@@ -1764,8 +1764,8 @@
+ EGwConnectionPrivate *priv;
+ SoupSoapParameter *param, *subparam, *second_level_child;
+ char *id, *name;
+- g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT);
+ static GStaticMutex connecting = G_STATIC_MUTEX_INIT;
++ g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT);
+
+ priv = cnc->priv;
+ g_static_mutex_lock (&connecting);
diff --git a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c
new file mode 100644
index 000000000000..c865775dae15
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c
@@ -0,0 +1,22 @@
+--- servers/groupwise/e-gw-item.c.orig Tue Jan 25 20:31:45 2005
++++ servers/groupwise/e-gw-item.c Tue Jan 25 20:32:28 2005
+@@ -2604,8 +2604,8 @@
+
+ /*attachments*/
+ if (priv->attach_list) {
+- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
+ GSList *al ;
++ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
+ for (al = priv->attach_list ; al != NULL ; al = al->next) {
+ EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ;
+ add_attachment_to_soap_message (attachment, msg) ;
+@@ -2669,8 +2669,8 @@
+
+ /*attachments*/
+ if (priv->attach_list) {
+- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
+ GSList *al ;
++ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
+ for (al = priv->attach_list ; al != NULL ; al = al->next) {
+ EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ;
+ add_attachment_to_soap_message (attachment, msg) ;
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 39bfa12d14fc..fdb7596355ec 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -1,8 +1,119 @@
+include/evolution-data-server-%%VERSION%%/camel/broken-date-parser.h
+include/evolution-data-server-%%VERSION%%/camel/camel-address.h
+include/evolution-data-server-%%VERSION%%/camel/camel-arg.h
+include/evolution-data-server-%%VERSION%%/camel/camel-block-file.h
+include/evolution-data-server-%%VERSION%%/camel/camel-certdb.h
+include/evolution-data-server-%%VERSION%%/camel/camel-charset-map.h
+include/evolution-data-server-%%VERSION%%/camel/camel-cipher-context.h
+include/evolution-data-server-%%VERSION%%/camel/camel-data-cache.h
+include/evolution-data-server-%%VERSION%%/camel/camel-data-wrapper.h
+include/evolution-data-server-%%VERSION%%/camel/camel-debug.h
+include/evolution-data-server-%%VERSION%%/camel/camel-digest-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-digest-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-digest-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-disco-diary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-disco-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-disco-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-exception-list.def
+include/evolution-data-server-%%VERSION%%/camel/camel-exception.h
+include/evolution-data-server-%%VERSION%%/camel/camel-file-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-filter-driver.h
+include/evolution-data-server-%%VERSION%%/camel/camel-filter-search.h
+include/evolution-data-server-%%VERSION%%/camel/camel-folder-search.h
+include/evolution-data-server-%%VERSION%%/camel/camel-folder-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-folder-thread.h
+include/evolution-data-server-%%VERSION%%/camel/camel-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-gpg-context.h
+include/evolution-data-server-%%VERSION%%/camel/camel-http-stream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-i18n.h
+include/evolution-data-server-%%VERSION%%/camel/camel-index.h
+include/evolution-data-server-%%VERSION%%/camel/camel-internet-address.h
+include/evolution-data-server-%%VERSION%%/camel/camel-junk-plugin.h
+include/evolution-data-server-%%VERSION%%/camel/camel-list-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-lock-client.h
+include/evolution-data-server-%%VERSION%%/camel/camel-lock.h
+include/evolution-data-server-%%VERSION%%/camel/camel-nntp-address.h
+include/evolution-data-server-%%VERSION%%/camel/camel-medium.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-basic.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-bestenc.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-canon.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-charset.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-crlf.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-enriched.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-from.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-gzip.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-html.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-index.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-linewrap.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-save.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-tohtml.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-windows.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-yenc.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-message.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-parser.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-part-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-part.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-movemail.h
+include/evolution-data-server-%%VERSION%%/camel/camel-multipart-encrypted.h
+include/evolution-data-server-%%VERSION%%/camel/camel-multipart-signed.h
+include/evolution-data-server-%%VERSION%%/camel/camel-multipart.h
+include/evolution-data-server-%%VERSION%%/camel/camel-net-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-object.h
+include/evolution-data-server-%%VERSION%%/camel/camel-offline-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-offline-journal.h
+include/evolution-data-server-%%VERSION%%/camel/camel-offline-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-operation.h
+include/evolution-data-server-%%VERSION%%/camel/camel-partition-table.h
+include/evolution-data-server-%%VERSION%%/camel/camel-provider.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-anonymous.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-cram-md5.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-digest-md5.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-gssapi.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-kerberos4.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-login.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-ntlm.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-plain.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-popb4smtp.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl.h
+include/evolution-data-server-%%VERSION%%/camel/camel-search-private.h
+include/evolution-data-server-%%VERSION%%/camel/camel-seekable-stream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-seekable-substream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-service.h
+include/evolution-data-server-%%VERSION%%/camel/camel-session.h
+include/evolution-data-server-%%VERSION%%/camel/camel-smime-context.h
+include/evolution-data-server-%%VERSION%%/camel/camel-store-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-buffer.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-filter.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-fs.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-mem.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-null.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-process.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-string-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream-raw.h
+include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream-ssl.h
+include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-text-index.h
+include/evolution-data-server-%%VERSION%%/camel/camel-transport.h
+include/evolution-data-server-%%VERSION%%/camel/camel-types.h
+include/evolution-data-server-%%VERSION%%/camel/camel-uid-cache.h
+include/evolution-data-server-%%VERSION%%/camel/camel-url-scanner.h
+include/evolution-data-server-%%VERSION%%/camel/camel-url.h
+include/evolution-data-server-%%VERSION%%/camel/camel-utf8.h
+include/evolution-data-server-%%VERSION%%/camel/camel-vee-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-vee-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-vee-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel.h
include/evolution-data-server-%%VERSION%%/groupwise/e-gw-connection.h
include/evolution-data-server-%%VERSION%%/groupwise/e-gw-container.h
include/evolution-data-server-%%VERSION%%/groupwise/e-gw-filter.h
include/evolution-data-server-%%VERSION%%/groupwise/e-gw-item.h
include/evolution-data-server-%%VERSION%%/groupwise/e-gw-message.h
+include/evolution-data-server-%%VERSION%%/groupwise/e-gw-sendoptions.h
include/evolution-data-server-%%VERSION%%/libebook/Evolution-DataServer-Addressbook.h
include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h
include/evolution-data-server-%%VERSION%%/libebook/e-book-listener.h
@@ -12,6 +123,7 @@ include/evolution-data-server-%%VERSION%%/libebook/e-book-view-listener.h
include/evolution-data-server-%%VERSION%%/libebook/e-book-view.h
include/evolution-data-server-%%VERSION%%/libebook/e-book.h
include/evolution-data-server-%%VERSION%%/libebook/e-contact.h
+include/evolution-data-server-%%VERSION%%/libebook/e-destination.h
include/evolution-data-server-%%VERSION%%/libebook/e-name-western-tables.h
include/evolution-data-server-%%VERSION%%/libebook/e-name-western.h
include/evolution-data-server-%%VERSION%%/libebook/e-vcard.h
@@ -26,6 +138,8 @@ include/evolution-data-server-%%VERSION%%/libecal/e-cal-view-listener.h
include/evolution-data-server-%%VERSION%%/libecal/e-cal-view.h
include/evolution-data-server-%%VERSION%%/libecal/e-cal.h
include/evolution-data-server-%%VERSION%%/libedata-book/Evolution-DataServer-Addressbook.h
+include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-cache.h
+include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-factory.h
include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-sexp.h
include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-summary.h
include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-sync.h
@@ -36,6 +150,7 @@ include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-view.h
include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book.h
include/evolution-data-server-%%VERSION%%/libedata-cal/Evolution-DataServer-Calendar.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-cache.h
+include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-factory.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sexp.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sync.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-util.h
@@ -46,23 +161,42 @@ include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-view.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-account-list.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-account.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-categories.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-component-listener.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-module.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-db3-utils.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-dbhash.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-file-cache.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-iconv.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-iterator.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-list-iterator.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-list.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-memory.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-msgport.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-sexp.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-source-group.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-source-list.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-source.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-time-utils.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-trie.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-uid.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-url.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-util.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-hash-utils.h
include/evolution-data-server-%%VERSION%%/libedataserver/md5-utils.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-book-auth-util.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-categories-dialog.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-contact-store.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-destination-store.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-dialog.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-entry.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-model.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-passwords.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-option-menu.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector-dialog.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-tree-model-generator.h
include/evolution-data-server-%%VERSION%%/libical/ical.h
include/evolution-data-server-%%VERSION%%/libical/icalarray.h
include/evolution-data-server-%%VERSION%%/libical/icalattach.h
@@ -107,32 +241,71 @@ include/evolution-data-server-%%VERSION%%/libical/sspm.h
include/evolution-data-server-%%VERSION%%/libical/vcaltmp.h
include/evolution-data-server-%%VERSION%%/libical/vcc.h
include/evolution-data-server-%%VERSION%%/libical/vobject.h
-lib/libebook.a
-lib/libebook.so
-lib/libebook.so.8
-lib/libecal.a
-lib/libecal.so
-lib/libecal.so.9
-lib/libedata-book.a
-lib/libedata-book.so
-lib/libedata-book.so.1
-lib/libedata-cal.a
-lib/libedata-cal.so
-lib/libedata-cal.so.6
-lib/libedataserver.a
-lib/libedataserver.so
-lib/libedataserver.so.5
-lib/libegroupwise.a
-lib/libegroupwise.so
-lib/libegroupwise.so.7
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelgroupwise.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelgroupwise.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap4.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap4.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamellocal.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamellocal.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelnntp.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelnntp.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelpop3.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelpop3.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsendmail.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsendmail.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsmtp.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsmtp.urls
+lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendfile.so
+lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendgroupwise.so
+lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendldap.so
+lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendvcf.so
+lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendcontacts.so
+lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendfile.so
+lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendgroupwise.so
+lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendhttp.so
+lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendweather.so
+lib/libcamel-%%VERSION%%.a
+lib/libcamel-%%VERSION%%.so
+lib/libcamel-%%VERSION%%.so.0
+lib/libcamel-provider-%%VERSION%%.a
+lib/libcamel-provider-%%VERSION%%.so
+lib/libcamel-provider-%%VERSION%%.so.4
+lib/libebook-%%VERSION%%.a
+lib/libebook-%%VERSION%%.so
+lib/libebook-%%VERSION%%.so.4
+lib/libecal-%%VERSION%%.a
+lib/libecal-%%VERSION%%.so
+lib/libecal-%%VERSION%%.so.2
+lib/libedata-book-%%VERSION%%.a
+lib/libedata-book-%%VERSION%%.so
+lib/libedata-book-%%VERSION%%.so.2
+lib/libedata-cal-%%VERSION%%.a
+lib/libedata-cal-%%VERSION%%.so
+lib/libedata-cal-%%VERSION%%.so.3
+lib/libedataserver-%%VERSION%%.a
+lib/libedataserver-%%VERSION%%.so
+lib/libedataserver-%%VERSION%%.so.4
+lib/libedataserverui-%%VERSION%%.a
+lib/libedataserverui-%%VERSION%%.so
+lib/libedataserverui-%%VERSION%%.so.5
+lib/libegroupwise-%%VERSION%%.a
+lib/libegroupwise-%%VERSION%%.so
+lib/libegroupwise-%%VERSION%%.so.5
libdata/bonobo/servers/GNOME_Evolution_DataServer_%%VERSION%%.server
+libdata/pkgconfig/camel-%%VERSION%%.pc
+libdata/pkgconfig/camel-provider-%%VERSION%%.pc
libdata/pkgconfig/evolution-data-server-%%VERSION%%.pc
libdata/pkgconfig/libebook-%%VERSION%%.pc
libdata/pkgconfig/libecal-%%VERSION%%.pc
libdata/pkgconfig/libedata-book-%%VERSION%%.pc
libdata/pkgconfig/libedata-cal-%%VERSION%%.pc
libdata/pkgconfig/libedataserver-%%VERSION%%.pc
+libdata/pkgconfig/libedataserverui-%%VERSION%%.pc
libdata/pkgconfig/libegroupwise-%%VERSION%%.pc
+libexec/camel-index-control-%%VERSION%%
+libexec/camel-lock-helper-%%VERSION%%
libexec/evolution-data-server-%%VERSION%%
share/doc/libebook/EBook.html
share/doc/libebook/EBookListener.html
@@ -172,7 +345,10 @@ share/doc/libecal/libecal.devhelp
share/doc/libecal/right.png
share/doc/libecal/style.css
share/doc/libecal/up.png
-%%LDAP%%share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema
+share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema
+share/gnome/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade
+share/gnome/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade
+share/gnome/evolution-data-server-%%VERSION%%/weather/Locations.xml
share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Abidjan.ics
share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Accra.ics
share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Addis_Ababa.ics
@@ -555,12 +731,31 @@ share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/zones.tab
share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer-Addressbook.idl
share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer-Calendar.idl
share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer.idl
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_birthday_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_business_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_favorites_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_gifts_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_goals_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_holiday-cards_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_holiday_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_hot-contacts_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_ideas_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_international_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_key-customer_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_miscellaneous_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_personal_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_phonecalls_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_status_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_strategies_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_suppliers_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_time-and-expenses_16.png
share/locale/am/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/ar/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/az/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/be/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/bg/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/bn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/bs/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/ca/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/cs/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/cy/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
@@ -579,14 +774,19 @@ share/locale/fr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/ga/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/gl/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/gu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/he/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/hi/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/hr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/hu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/id/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/is/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/it/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/ja/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/ko/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/lt/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/lv/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/mk/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/ml/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/mn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/ms/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/nb/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
@@ -608,8 +808,10 @@ share/locale/sv/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/tr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/uk/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/vi/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/wa/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+@dirrm share/gnome/pixmaps/evolution-data-server-%%VERSION%%
@dirrm share/gnome/idl/evolution-data-server-%%VERSION%%
@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific
@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian
@@ -625,14 +827,21 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America
@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa
@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo
+@dirrm share/gnome/evolution-data-server-%%VERSION%%/weather
+@dirrm share/gnome/evolution-data-server-%%VERSION%%/glade
@dirrm share/gnome/evolution-data-server-%%VERSION%%
@dirrm share/doc/libecal
@dirrm share/doc/libebook
+@dirrm lib/evolution-data-server-%%VERSION%%/extensions
+@dirrm lib/evolution-data-server-%%VERSION%%/camel-providers
+@dirrm lib/evolution-data-server-%%VERSION%%
@dirrm include/evolution-data-server-%%VERSION%%/libical
+@dirrm include/evolution-data-server-%%VERSION%%/libedataserverui
@dirrm include/evolution-data-server-%%VERSION%%/libedataserver
@dirrm include/evolution-data-server-%%VERSION%%/libedata-cal
@dirrm include/evolution-data-server-%%VERSION%%/libedata-book
@dirrm include/evolution-data-server-%%VERSION%%/libecal
@dirrm include/evolution-data-server-%%VERSION%%/libebook
@dirrm include/evolution-data-server-%%VERSION%%/groupwise
+@dirrm include/evolution-data-server-%%VERSION%%/camel
@dirrm include/evolution-data-server-%%VERSION%%
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 9028bea115c0..6045013e614a 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= libgda2
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.2.1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.0
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.2
DISTNAME= libgda-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -24,11 +23,12 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier glib20 libxslt
+USE_GNOME= gnomeprefix gnomehack glib20 libxslt
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL_VER=15
USE_REINPLACE= yes
+CONFIGURE_ARGS= --without-bdb
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
@@ -47,10 +47,6 @@ post-patch:
WITH_MYSQL= yes
.endif
-.if exists(${LOCALBASE}/lib/libpq.so.3)
-WITH_PGSQL= yes
-.endif
-
.if exists(${LOCALBASE}/lib/libldap.so.2)
WITH_LDAP=yes
.endif
@@ -111,7 +107,7 @@ LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird
CONFIGURE_ARGS+= --with-firebird=${LOCALBASE}/firebird
PLIST_SUB+= FIREBIRD:=""
.else
-CONFIGURE_ARGS+= --without-firebird
+CONFIGURE_ARGS+= --without-interbase
PLIST_SUB+= FIREBIRD:="@comment "
.endif
@@ -152,7 +148,7 @@ PLIST_SUB+= ODBC:="@comment "
.endif
.if !defined(WITHOUT_SQLITE) && defined(WITH_SQLITE)
-LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite
CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE}
PLIST_SUB+= SQLITE:=""
.else
@@ -164,9 +160,6 @@ pre-everything::
.if !defined(WITH_MYSQL)
@${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL."
.endif
-.if !defined(WITH_PGSQL)
- @${ECHO_MSG} "You can enable support for PostgreSQL databases by defining WITH_PGSQL."
-.endif
.if !defined(WITH_LDAP)
@${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP."
.endif
diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo
index c0592ec3808a..d03935fd78c2 100644
--- a/databases/libgda2/distinfo
+++ b/databases/libgda2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgda-1.0.4.tar.bz2) = c13d884dc61a3819c91422880147864d
-SIZE (gnome2/libgda-1.0.4.tar.bz2) = 1112201
+MD5 (gnome2/libgda-1.2.1.tar.bz2) = 513a3b7adb66fa5641bae5394f60c017
+SIZE (gnome2/libgda-1.2.1.tar.bz2) = 1223001
diff --git a/databases/libgda2/files/patch-doc::libgda-C.omf.in b/databases/libgda2/files/patch-doc::libgda-C.omf.in
index cc83c742bedd..f98b540c5562 100644
--- a/databases/libgda2/files/patch-doc::libgda-C.omf.in
+++ b/databases/libgda2/files/patch-doc::libgda-C.omf.in
@@ -1,11 +1,11 @@
---- doc/libgda-C.omf.in.orig Thu Oct 2 11:54:08 2003
-+++ doc/libgda-C.omf.in Thu Oct 2 11:54:58 2003
+--- doc/libgda-C.omf.in.orig Mon Feb 28 05:30:59 2005
++++ doc/libgda-C.omf.in Thu Mar 3 14:07:24 2005
@@ -16,7 +16,7 @@
</description>
<type>user's guide</type>
<format mime="text/html"/>
-- <identifier url="file:/@prefix@/share/gtk-doc/html/libgda/index.html"/>
-+ <identifier url="file:/@prefix@/share/doc/libgda/index.html"/>
+- <identifier url="file:@prefix@/share/gtk-doc/html/libgda/index.html"/>
++ <identifier url="file:@prefix@/share/doc/libgda/index.html"/>
<language code="C"/>
<relation seriesid="ebe4f574-a94d-11d6-8bc3-bd1f202a92f8"/>
<rights type="GNU FDL" license.version="1.1"/>
diff --git a/databases/libgda2/files/patch-doc_C_Makefile.in b/databases/libgda2/files/patch-doc_C_Makefile.in
index 718a4a1ebe6f..ef37c3190b54 100644
--- a/databases/libgda2/files/patch-doc_C_Makefile.in
+++ b/databases/libgda2/files/patch-doc_C_Makefile.in
@@ -1,11 +1,11 @@
---- doc/C/Makefile.in.orig Sun Jun 2 22:17:05 2002
-+++ doc/C/Makefile.in Sun Jun 2 22:17:27 2002
-@@ -152,7 +152,7 @@
- cxxflags_set = @cxxflags_set@
-
- DOC_MODULE = libgda
+--- doc/C/Makefile.in.orig Thu Jul 22 10:35:19 2004
++++ doc/C/Makefile.in Thu Jul 22 10:35:48 2004
+@@ -116,7 +116,7 @@
+ HISTORY_LIB = @HISTORY_LIB@
+ HISTORY_LIB_FALSE = @HISTORY_LIB_FALSE@
+ HISTORY_LIB_TRUE = @HISTORY_LIB_TRUE@
-HTML_DIR = $(datadir)/gtk-doc/html
+HTML_DIR = $(prefix)/share/doc
-
- # The top-level SGML file. Change it if you want.
- DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+ IBMDB2_CFLAGS = @IBMDB2_CFLAGS@
+ IBMDB2_FALSE = @IBMDB2_FALSE@
+ IBMDB2_LIBS = @IBMDB2_LIBS@
diff --git a/databases/libgda2/files/patch-libgda_gda-util.c b/databases/libgda2/files/patch-libgda_gda-util.c
deleted file mode 100644
index 61a7cded1fdb..000000000000
--- a/databases/libgda2/files/patch-libgda_gda-util.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgda/gda-util.c.orig Sat Jul 17 11:02:21 2004
-+++ libgda/gda-util.c Sat Jul 17 11:03:07 2004
-@@ -60,7 +60,7 @@
- case GDA_VALUE_TYPE_TIME : return "time";
- case GDA_VALUE_TYPE_TIMESTAMP : return "timestamp";
- case GDA_VALUE_TYPE_TINYINT : return "tinyint";
-- default:
-+ default: ;
- }
-
- return "string";
diff --git a/databases/libgda2/files/patch-ltmain.sh b/databases/libgda2/files/patch-ltmain.sh
deleted file mode 100644
index 860ddda642f7..000000000000
--- a/databases/libgda2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig Tue Aug 5 18:08:30 2003
-+++ ltmain.sh Wed Aug 6 08:18:27 2003
-@@ -1278,7 +1278,7 @@
- esac
- elif test "X$arg" = "X-lc_r"; then
- case $host in
-- *-*-openbsd* | *-*-freebsd*)
-+ *-*-openbsd* | *-*-freebsd4*)
- # Do not include libc_r directly, use -pthread flag.
- continue
- ;;
-@@ -1288,8 +1288,16 @@
- continue
- ;;
-
-+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_flags="$compiler_flags -pthread"
-+ continue
-+ ;;
-+
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -3008,6 +3016,9 @@
- # problems, so we reset it completely
- verstring=
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- verstring="0.0"
- ;;
-@@ -5457,10 +5468,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/databases/libgda2/files/patch-po_Makefile.in.in b/databases/libgda2/files/patch-po_Makefile.in.in
new file mode 100644
index 000000000000..1e6984b6bbca
--- /dev/null
+++ b/databases/libgda2/files/patch-po_Makefile.in.in
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig Sat Aug 14 00:43:46 2004
++++ po/Makefile.in.in Sat Aug 14 00:45:54 2004
+@@ -35,6 +35,7 @@
+
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+
+ CC = @CC@
+ GENCAT = @GENCAT@
diff --git a/databases/libgda2/files/patch-providers_ldap_gda-ldap-provider.c b/databases/libgda2/files/patch-providers_ldap_gda-ldap-provider.c
deleted file mode 100644
index 182c120967dc..000000000000
--- a/databases/libgda2/files/patch-providers_ldap_gda-ldap-provider.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- providers/ldap/gda-ldap-provider.c.orig Sat Jul 17 11:06:48 2004
-+++ providers/ldap/gda-ldap-provider.c Sat Jul 17 11:06:57 2004
-@@ -275,7 +275,7 @@
- switch (feature) {
- case GDA_CONNECTION_FEATURE_SQL :
- return TRUE;
-- default :
-+ default : ;
- }
-
- return FALSE;
-@@ -466,7 +466,7 @@
- return get_ldap_tables (cnc, params);
- case GDA_CONNECTION_SCHEMA_TYPES :
- return get_ldap_types (cnc, params);
-- default :
-+ default : ;
- }
-
- return NULL;
diff --git a/databases/libgda2/files/patch-providers_mdb_gda-mdb-provider.c b/databases/libgda2/files/patch-providers_mdb_gda-mdb-provider.c
deleted file mode 100644
index a56a2df2a1a0..000000000000
--- a/databases/libgda2/files/patch-providers_mdb_gda-mdb-provider.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- providers/mdb/gda-mdb-provider.c.orig Sat Jul 17 11:05:48 2004
-+++ providers/mdb/gda-mdb-provider.c Sat Jul 17 11:06:12 2004
-@@ -389,7 +389,7 @@
- g_strfreev (arr);
- }
- break;
-- default :
-+ default : ;
- }
-
- return reclist;
-@@ -438,7 +438,7 @@
- case GDA_CONNECTION_FEATURE_PROCEDURES :
- case GDA_CONNECTION_FEATURE_SQL :
- return TRUE;
-- default :
-+ default : ;
- }
-
- return FALSE;
diff --git a/databases/libgda2/files/patch-providers_mysql_gda-mysql-provider.c b/databases/libgda2/files/patch-providers_mysql_gda-mysql-provider.c
deleted file mode 100644
index 4b13d3f74cb5..000000000000
--- a/databases/libgda2/files/patch-providers_mysql_gda-mysql-provider.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- patch-providers_mysql_gda-mysql-provider.c begins here ---
---- providers/mysql/gda-mysql-provider.c.orig Sat Aug 14 22:14:57 2004
-+++ providers/mysql/gda-mysql-provider.c Sat Aug 14 22:15:59 2004
-@@ -510,7 +510,7 @@
-
- g_free (str);
- break;
-- default:
-+ default: ;
- }
-
- return reclist;
-@@ -655,7 +655,7 @@
- case GDA_CONNECTION_FEATURE_SQL :
- case GDA_CONNECTION_FEATURE_TRANSACTIONS :
- return TRUE;
-- default :
-+ default : ;
- }
-
- return FALSE;
-@@ -1187,7 +1187,7 @@
- return get_mysql_tables (cnc, params);
- case GDA_CONNECTION_SCHEMA_TYPES :
- return get_mysql_types (cnc, params);
-- default :
-+ default : ;
- }
-
- return NULL;
diff --git a/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c b/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c
index 758d31ca4869..b0d7ad4862b1 100644
--- a/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c
+++ b/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c
@@ -1,11 +1,13 @@
---- providers/mysql/gda-mysql-recordset.c.orig Mon Feb 17 21:42:16 2003
-+++ providers/mysql/gda-mysql-recordset.c Mon Feb 17 21:42:57 2003
-@@ -102,7 +102,7 @@
- break;
- case FIELD_TYPE_LONGLONG :
- case FIELD_TYPE_INT24 :
-- gda_value_set_bigint (field, thevalue ? atoll (thevalue) : 0);
-+ gda_value_set_bigint (field, thevalue ? strtoll(thevalue, &thevalue, 10) : 0);
- break;
- case FIELD_TYPE_SHORT :
- gda_value_set_smallint (field, thevalue ? atoi (thevalue) : 0);
+--- providers/mysql/gda-mysql-recordset.c.orig Thu Jul 22 10:40:31 2004
++++ providers/mysql/gda-mysql-recordset.c Thu Jul 22 10:42:51 2004
+@@ -67,8 +67,8 @@
+ case FIELD_TYPE_LONGLONG :
+ case FIELD_TYPE_INT24 :
+ if (is_unsigned)
+- gda_value_set_biguint (gda_value, atoll (value));
+- gda_value_set_bigint (gda_value, atoll (value));
++ gda_value_set_biguint (gda_value, strtoll (value, &value, 10));
++ gda_value_set_bigint (gda_value, strtoll (value, &value, 10));
+ break;
+ case FIELD_TYPE_SHORT :
+ if (is_unsigned)
diff --git a/databases/libgda2/files/patch-providers_oracle_utils.c b/databases/libgda2/files/patch-providers_oracle_utils.c
deleted file mode 100644
index a38974770e24..000000000000
--- a/databases/libgda2/files/patch-providers_oracle_utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- providers/oracle/utils.c.orig Sat Jul 17 11:07:46 2004
-+++ providers/oracle/utils.c Sat Jul 17 11:08:12 2004
-@@ -110,7 +110,7 @@
- break;
- case OCI_HTYPE_ENV:
- gda_connection_add_error (cnc, gda_oracle_make_error (priv_data->henv, type, file, line));
-- default:
-+ default: ;
- }
- break;
- default:
diff --git a/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c b/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c
deleted file mode 100644
index 66454f222810..000000000000
--- a/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- providers/sqlite/gda-sqlite-provider.c.orig Sat Jul 17 11:09:00 2004
-+++ providers/sqlite/gda-sqlite-provider.c Sat Jul 17 11:09:07 2004
-@@ -623,7 +623,7 @@
- case GDA_CONNECTION_FEATURE_TRIGGERS :
- case GDA_CONNECTION_FEATURE_VIEWS :
- return TRUE;
-- default:
-+ default: ;
- }
-
- return FALSE;
-@@ -809,7 +809,7 @@
- return get_tables (cnc);
- case GDA_CONNECTION_SCHEMA_TYPES :
- return get_types ();
-- default:
-+ default: ;
- }
-
- return NULL;
diff --git a/databases/libgda2/files/patch-providers_xml_gda-xml-provider.c b/databases/libgda2/files/patch-providers_xml_gda-xml-provider.c
deleted file mode 100644
index 487d19514fc6..000000000000
--- a/databases/libgda2/files/patch-providers_xml_gda-xml-provider.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- providers/xml/gda-xml-provider.c.orig Sat Jul 17 11:05:02 2004
-+++ providers/xml/gda-xml-provider.c Sat Jul 17 11:05:11 2004
-@@ -681,7 +681,7 @@
- return get_tables (cnc, xmldb);
- case GDA_CONNECTION_SCHEMA_TYPES :
- return get_types (cnc);
-- default :
-+ default : ;
- }
-
- return NULL;
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index 47a454eadc30..b2da31b8cbaa 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -2,79 +2,79 @@ bin/gda-config-tool
bin/gda-report-test
bin/gda-run
etc/libgda/config
-include/libgda-report/gda-report-document.h
-include/libgda-report/gda-report-item-detail.h
-include/libgda-report/gda-report-item-label.h
-include/libgda-report/gda-report-item-pagefooter.h
-include/libgda-report/gda-report-item-pageheader.h
-include/libgda-report/gda-report-item-repfield.h
-include/libgda-report/gda-report-item-report.h
-include/libgda-report/gda-report-item-reportfooter.h
-include/libgda-report/gda-report-item-reportheader.h
-include/libgda-report/gda-report-item-sqlquery.h
-include/libgda-report/gda-report-item.h
-include/libgda-report/gda-report-result.h
-include/libgda-report/gda-report-types.h
-include/libgda-report/gda-report-valid.h
-include/libgda-report/gda-report.h
-include/libgda/gda-blob.h
-include/libgda/gda-client.h
-include/libgda/gda-command.h
-include/libgda/gda-config.h
-include/libgda/gda-connection.h
-include/libgda/gda-data-model-array.h
-include/libgda/gda-data-model-hash.h
-include/libgda/gda-data-model-list.h
-include/libgda/gda-data-model.h
-include/libgda/gda-enum-types.h
-include/libgda/gda-error.h
-include/libgda/gda-export.h
-include/libgda/gda-field.h
-include/libgda/gda-log.h
-include/libgda/gda-marshal.h
-include/libgda/gda-parameter.h
-include/libgda/gda-quark-list.h
-include/libgda/gda-row.h
-include/libgda/gda-select.h
-include/libgda/gda-server-provider.h
-include/libgda/gda-table.h
-include/libgda/gda-transaction.h
-include/libgda/gda-util.h
-include/libgda/gda-value.h
-include/libgda/gda-xml-connection.h
-include/libgda/gda-xml-database.h
-include/libgda/gda-xml-document.h
-include/libgda/gda-xql-atom.h
-include/libgda/gda-xql-bin.h
-include/libgda/gda-xql-column.h
-include/libgda/gda-xql-const.h
-include/libgda/gda-xql-delete.h
-include/libgda/gda-xql-dml.h
-include/libgda/gda-xql-dual.h
-include/libgda/gda-xql-field.h
-include/libgda/gda-xql-func.h
-include/libgda/gda-xql-insert.h
-include/libgda/gda-xql-item.h
-include/libgda/gda-xql-join.h
-include/libgda/gda-xql-list.h
-include/libgda/gda-xql-query.h
-include/libgda/gda-xql-select.h
-include/libgda/gda-xql-stack.h
-include/libgda/gda-xql-target.h
-include/libgda/gda-xql-update.h
-include/libgda/gda-xql-utils.h
-include/libgda/gda-xql-value.h
-include/libgda/gda-xql-valueref.h
-include/libgda/libgda.h
+include/libgda-1.2/libgda-report/gda-report-document.h
+include/libgda-1.2/libgda-report/gda-report-item-detail.h
+include/libgda-1.2/libgda-report/gda-report-item-label.h
+include/libgda-1.2/libgda-report/gda-report-item-pagefooter.h
+include/libgda-1.2/libgda-report/gda-report-item-pageheader.h
+include/libgda-1.2/libgda-report/gda-report-item-repfield.h
+include/libgda-1.2/libgda-report/gda-report-item-report.h
+include/libgda-1.2/libgda-report/gda-report-item-reportfooter.h
+include/libgda-1.2/libgda-report/gda-report-item-reportheader.h
+include/libgda-1.2/libgda-report/gda-report-item-sqlquery.h
+include/libgda-1.2/libgda-report/gda-report-item.h
+include/libgda-1.2/libgda-report/gda-report-result.h
+include/libgda-1.2/libgda-report/gda-report-types.h
+include/libgda-1.2/libgda-report/gda-report-valid.h
+include/libgda-1.2/libgda-report/gda-report.h
+include/libgda-1.2/libgda/gda-blob.h
+include/libgda-1.2/libgda/gda-client.h
+include/libgda-1.2/libgda/gda-command.h
+include/libgda-1.2/libgda/gda-config.h
+include/libgda-1.2/libgda/gda-connection.h
+include/libgda-1.2/libgda/gda-data-model-array.h
+include/libgda-1.2/libgda/gda-data-model-hash.h
+include/libgda-1.2/libgda/gda-data-model-list.h
+include/libgda-1.2/libgda/gda-data-model.h
+include/libgda-1.2/libgda/gda-enum-types.h
+include/libgda-1.2/libgda/gda-error.h
+include/libgda-1.2/libgda/gda-field.h
+include/libgda-1.2/libgda/gda-log.h
+include/libgda-1.2/libgda/gda-marshal.h
+include/libgda-1.2/libgda/gda-parameter.h
+include/libgda-1.2/libgda/gda-quark-list.h
+include/libgda-1.2/libgda/gda-row.h
+include/libgda-1.2/libgda/gda-select.h
+include/libgda-1.2/libgda/gda-server-provider.h
+include/libgda-1.2/libgda/gda-table.h
+include/libgda-1.2/libgda/gda-transaction.h
+include/libgda-1.2/libgda/gda-util.h
+include/libgda-1.2/libgda/gda-value.h
+include/libgda-1.2/libgda/gda-xml-connection.h
+include/libgda-1.2/libgda/gda-xml-database.h
+include/libgda-1.2/libgda/gda-xml-document.h
+include/libgda-1.2/libgda/gda-xql-atom.h
+include/libgda-1.2/libgda/gda-xql-bin.h
+include/libgda-1.2/libgda/gda-xql-column.h
+include/libgda-1.2/libgda/gda-xql-const.h
+include/libgda-1.2/libgda/gda-xql-delete.h
+include/libgda-1.2/libgda/gda-xql-dml.h
+include/libgda-1.2/libgda/gda-xql-dual.h
+include/libgda-1.2/libgda/gda-xql-field.h
+include/libgda-1.2/libgda/gda-xql-func.h
+include/libgda-1.2/libgda/gda-xql-insert.h
+include/libgda-1.2/libgda/gda-xql-item.h
+include/libgda-1.2/libgda/gda-xql-join.h
+include/libgda-1.2/libgda/gda-xql-list.h
+include/libgda-1.2/libgda/gda-xql-query.h
+include/libgda-1.2/libgda/gda-xql-select.h
+include/libgda-1.2/libgda/gda-xql-stack.h
+include/libgda-1.2/libgda/gda-xql-target.h
+include/libgda-1.2/libgda/gda-xql-update.h
+include/libgda-1.2/libgda/gda-xql-utils.h
+include/libgda-1.2/libgda/gda-xql-value.h
+include/libgda-1.2/libgda/gda-xql-valueref.h
+include/libgda-1.2/libgda/libgda.h
+include/libgda-1.2/sql/sql_parser.h
lib/libgda-2.a
lib/libgda-2.so
-lib/libgda-2.so.2
+lib/libgda-2.so.3
lib/libgda-report-2.a
lib/libgda-report-2.so
-lib/libgda-report-2.so.2
+lib/libgda-report-2.so.3
lib/libgdasql.a
lib/libgdasql.so
-lib/libgdasql.so.0
+lib/libgdasql.so.3
%%FIREBIRD:%%lib/libgda/providers/libgda-firebird.so
%%FREETDS:%%lib/libgda/providers/libgda-freetds.so
%%LDAP:%%lib/libgda/providers/libgda-ldap.so
@@ -87,7 +87,10 @@ lib/libgdasql.so.0
lib/libgda/providers/libgda-xml.so
libdata/pkgconfig/libgda.pc
%%DOCSDIR%%/architecture.html
-%%DOCSDIR%%/c694.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/ch09s04.html
+%%DOCSDIR%%/ch09s05.html
+%%DOCSDIR%%/ch09s06.html
%%DOCSDIR%%/compiling.html
%%DOCSDIR%%/connecting.html
%%DOCSDIR%%/connections.html
@@ -104,13 +107,63 @@ libdata/pkgconfig/libgda.pc
%%DOCSDIR%%/fdl-section9.html
%%DOCSDIR%%/fdl-using.html
%%DOCSDIR%%/fdl.html
-%%DOCSDIR%%/gdavalue.html
+%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/installation-configuring.html
%%DOCSDIR%%/installation-installing.html
%%DOCSDIR%%/installation.html
%%DOCSDIR%%/introduction.html
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libgda.devhelp
+%%DOCSDIR%%/libgda-GdaClient.html
+%%DOCSDIR%%/libgda-GdaConnection.html
+%%DOCSDIR%%/libgda-GdaDataModel.html
+%%DOCSDIR%%/libgda-GdaDataModelArray.html
+%%DOCSDIR%%/libgda-GdaDataModelHash.html
+%%DOCSDIR%%/libgda-GdaDataModelList.html
+%%DOCSDIR%%/libgda-GdaError.html
+%%DOCSDIR%%/libgda-GdaExport.html
+%%DOCSDIR%%/libgda-GdaReportDocument.html
+%%DOCSDIR%%/libgda-GdaReportItem.html
+%%DOCSDIR%%/libgda-GdaReportItemDetail.html
+%%DOCSDIR%%/libgda-GdaReportItemLabel.html
+%%DOCSDIR%%/libgda-GdaReportItemPageFooter.html
+%%DOCSDIR%%/libgda-GdaReportItemPageHeader.html
+%%DOCSDIR%%/libgda-GdaReportItemRepField.html
+%%DOCSDIR%%/libgda-GdaReportItemReport.html
+%%DOCSDIR%%/libgda-GdaReportItemReportFooter.html
+%%DOCSDIR%%/libgda-GdaReportItemReportHeader.html
+%%DOCSDIR%%/libgda-GdaReportItemSqlQuery.html
+%%DOCSDIR%%/libgda-GdaReportResult.html
+%%DOCSDIR%%/libgda-GdaReportValid.html
+%%DOCSDIR%%/libgda-GdaSelect.html
+%%DOCSDIR%%/libgda-GdaServerProvider.html
+%%DOCSDIR%%/libgda-GdaTable.html
+%%DOCSDIR%%/libgda-GdaTransaction.html
+%%DOCSDIR%%/libgda-GdaXmlConnection.html
+%%DOCSDIR%%/libgda-GdaXmlDatabase.html
+%%DOCSDIR%%/libgda-GdaXmlDocument.html
+%%DOCSDIR%%/libgda-GdaXqlAtom.html
+%%DOCSDIR%%/libgda-GdaXqlBin.html
+%%DOCSDIR%%/libgda-GdaXqlColumn.html
+%%DOCSDIR%%/libgda-GdaXqlConst.html
+%%DOCSDIR%%/libgda-GdaXqlDelete.html
+%%DOCSDIR%%/libgda-GdaXqlDml.html
+%%DOCSDIR%%/libgda-GdaXqlDual.html
+%%DOCSDIR%%/libgda-GdaXqlField.html
+%%DOCSDIR%%/libgda-GdaXqlFunc.html
+%%DOCSDIR%%/libgda-GdaXqlInsert.html
+%%DOCSDIR%%/libgda-GdaXqlItem.html
+%%DOCSDIR%%/libgda-GdaXqlJoin.html
+%%DOCSDIR%%/libgda-GdaXqlList.html
+%%DOCSDIR%%/libgda-GdaXqlQuery.html
+%%DOCSDIR%%/libgda-GdaXqlSelect.html
+%%DOCSDIR%%/libgda-GdaXqlStack.html
+%%DOCSDIR%%/libgda-GdaXqlTarget.html
+%%DOCSDIR%%/libgda-GdaXqlUpdate.html
+%%DOCSDIR%%/libgda-GdaXqlValue.html
+%%DOCSDIR%%/libgda-GdaXqlValueRef.html
%%DOCSDIR%%/libgda-api.html
%%DOCSDIR%%/libgda-gda-blob.html
%%DOCSDIR%%/libgda-gda-command.html
@@ -124,69 +177,23 @@ libdata/pkgconfig/libgda.pc
%%DOCSDIR%%/libgda-gda-util.html
%%DOCSDIR%%/libgda-gda-value.html
%%DOCSDIR%%/libgda-gda-xql-utils.html
-%%DOCSDIR%%/libgda-gdaclient.html
-%%DOCSDIR%%/libgda-gdaconnection.html
-%%DOCSDIR%%/libgda-gdadatamodel.html
-%%DOCSDIR%%/libgda-gdadatamodelarray.html
-%%DOCSDIR%%/libgda-gdadatamodelhash.html
-%%DOCSDIR%%/libgda-gdadatamodellist.html
-%%DOCSDIR%%/libgda-gdaerror.html
-%%DOCSDIR%%/libgda-gdaexport.html
-%%DOCSDIR%%/libgda-gdareportdocument.html
-%%DOCSDIR%%/libgda-gdareportitem.html
-%%DOCSDIR%%/libgda-gdareportitemdetail.html
-%%DOCSDIR%%/libgda-gdareportitemlabel.html
-%%DOCSDIR%%/libgda-gdareportitempagefooter.html
-%%DOCSDIR%%/libgda-gdareportitempageheader.html
-%%DOCSDIR%%/libgda-gdareportitemrepfield.html
-%%DOCSDIR%%/libgda-gdareportitemreport.html
-%%DOCSDIR%%/libgda-gdareportitemreportfooter.html
-%%DOCSDIR%%/libgda-gdareportitemreportheader.html
-%%DOCSDIR%%/libgda-gdareportitemsqlquery.html
-%%DOCSDIR%%/libgda-gdareportresult.html
-%%DOCSDIR%%/libgda-gdareportvalid.html
-%%DOCSDIR%%/libgda-gdaselect.html
-%%DOCSDIR%%/libgda-gdaserverprovider.html
-%%DOCSDIR%%/libgda-gdatable.html
-%%DOCSDIR%%/libgda-gdatransaction.html
-%%DOCSDIR%%/libgda-gdaxmlconnection.html
-%%DOCSDIR%%/libgda-gdaxmldatabase.html
-%%DOCSDIR%%/libgda-gdaxmldocument.html
-%%DOCSDIR%%/libgda-gdaxqlatom.html
-%%DOCSDIR%%/libgda-gdaxqlbin.html
-%%DOCSDIR%%/libgda-gdaxqlcolumn.html
-%%DOCSDIR%%/libgda-gdaxqlconst.html
-%%DOCSDIR%%/libgda-gdaxqldelete.html
-%%DOCSDIR%%/libgda-gdaxqldml.html
-%%DOCSDIR%%/libgda-gdaxqldual.html
-%%DOCSDIR%%/libgda-gdaxqlfield.html
-%%DOCSDIR%%/libgda-gdaxqlfunc.html
-%%DOCSDIR%%/libgda-gdaxqlinsert.html
-%%DOCSDIR%%/libgda-gdaxqlitem.html
-%%DOCSDIR%%/libgda-gdaxqljoin.html
-%%DOCSDIR%%/libgda-gdaxqllist.html
-%%DOCSDIR%%/libgda-gdaxqlquery.html
-%%DOCSDIR%%/libgda-gdaxqlselect.html
-%%DOCSDIR%%/libgda-gdaxqlstack.html
-%%DOCSDIR%%/libgda-gdaxqltarget.html
-%%DOCSDIR%%/libgda-gdaxqlupdate.html
-%%DOCSDIR%%/libgda-gdaxqlvalue.html
-%%DOCSDIR%%/libgda-gdaxqlvalueref.html
%%DOCSDIR%%/libgda-libgda.html
%%DOCSDIR%%/libgda-provider-class.html
%%DOCSDIR%%/libgda-provider-recordset.html
%%DOCSDIR%%/libgda-providers.html
%%DOCSDIR%%/libgda-reports.html
+%%DOCSDIR%%/libgda-server-provider-details.html
%%DOCSDIR%%/libgda-xql.html
%%DOCSDIR%%/main_example.html
+%%DOCSDIR%%/manage-gdavalue.html
%%DOCSDIR%%/managing-errors.html
%%DOCSDIR%%/migration-configuration.html
%%DOCSDIR%%/migration-executing-commands.html
%%DOCSDIR%%/migration.html
%%DOCSDIR%%/processing-queries.html
-%%DOCSDIR%%/x863.html
-%%DOCSDIR%%/x892.html
-%%DOCSDIR%%/x897.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
share/gnome/libgda/xml/gda-report.dtd
share/gnome/libgda/xml/gda-report-result.dtd
share/gnome/libgda/xml/gda-xml-query.dtd
@@ -208,12 +215,12 @@ share/locale/ga/LC_MESSAGES/libgda-2.mo
share/locale/gl/LC_MESSAGES/libgda-2.mo
share/locale/hr/LC_MESSAGES/libgda-2.mo
share/locale/hu/LC_MESSAGES/libgda-2.mo
-share/locale/id/LC_MESSAGES/libgda-2.mo
share/locale/it/LC_MESSAGES/libgda-2.mo
share/locale/ja/LC_MESSAGES/libgda-2.mo
share/locale/ko/LC_MESSAGES/libgda-2.mo
share/locale/ml/LC_MESSAGES/libgda-2.mo
share/locale/ms/LC_MESSAGES/libgda-2.mo
+share/locale/nb/LC_MESSAGES/libgda-2.mo
share/locale/nl/LC_MESSAGES/libgda-2.mo
share/locale/no/LC_MESSAGES/libgda-2.mo
share/locale/pl/LC_MESSAGES/libgda-2.mo
@@ -222,6 +229,7 @@ share/locale/pt_BR/LC_MESSAGES/libgda-2.mo
share/locale/ru/LC_MESSAGES/libgda-2.mo
share/locale/sk/LC_MESSAGES/libgda-2.mo
share/locale/sl/LC_MESSAGES/libgda-2.mo
+share/locale/sq/LC_MESSAGES/libgda-2.mo
share/locale/sr/LC_MESSAGES/libgda-2.mo
share/locale/sr@Latn/LC_MESSAGES/libgda-2.mo
share/locale/sv/LC_MESSAGES/libgda-2.mo
@@ -235,7 +243,8 @@ share/locale/zh_TW/LC_MESSAGES/libgda-2.mo
@dirrm share/gnome/libgda
@dirrm lib/libgda/providers
@dirrm lib/libgda
-@dirrm include/libgda/sql
-@dirrm include/libgda
-@dirrm include/libgda-report
+@dirrm include/libgda-1.2/sql
+@dirrm include/libgda-1.2/libgda-report
+@dirrm include/libgda-1.2/libgda
+@dirrm include/libgda-1.2
@dirrm etc/libgda
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 9028bea115c0..6045013e614a 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= libgda2
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.2.1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.0
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.2
DISTNAME= libgda-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -24,11 +23,12 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier glib20 libxslt
+USE_GNOME= gnomeprefix gnomehack glib20 libxslt
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL_VER=15
USE_REINPLACE= yes
+CONFIGURE_ARGS= --without-bdb
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
@@ -47,10 +47,6 @@ post-patch:
WITH_MYSQL= yes
.endif
-.if exists(${LOCALBASE}/lib/libpq.so.3)
-WITH_PGSQL= yes
-.endif
-
.if exists(${LOCALBASE}/lib/libldap.so.2)
WITH_LDAP=yes
.endif
@@ -111,7 +107,7 @@ LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird
CONFIGURE_ARGS+= --with-firebird=${LOCALBASE}/firebird
PLIST_SUB+= FIREBIRD:=""
.else
-CONFIGURE_ARGS+= --without-firebird
+CONFIGURE_ARGS+= --without-interbase
PLIST_SUB+= FIREBIRD:="@comment "
.endif
@@ -152,7 +148,7 @@ PLIST_SUB+= ODBC:="@comment "
.endif
.if !defined(WITHOUT_SQLITE) && defined(WITH_SQLITE)
-LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite
CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE}
PLIST_SUB+= SQLITE:=""
.else
@@ -164,9 +160,6 @@ pre-everything::
.if !defined(WITH_MYSQL)
@${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL."
.endif
-.if !defined(WITH_PGSQL)
- @${ECHO_MSG} "You can enable support for PostgreSQL databases by defining WITH_PGSQL."
-.endif
.if !defined(WITH_LDAP)
@${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP."
.endif
diff --git a/databases/libgda3/distinfo b/databases/libgda3/distinfo
index c0592ec3808a..d03935fd78c2 100644
--- a/databases/libgda3/distinfo
+++ b/databases/libgda3/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgda-1.0.4.tar.bz2) = c13d884dc61a3819c91422880147864d
-SIZE (gnome2/libgda-1.0.4.tar.bz2) = 1112201
+MD5 (gnome2/libgda-1.2.1.tar.bz2) = 513a3b7adb66fa5641bae5394f60c017
+SIZE (gnome2/libgda-1.2.1.tar.bz2) = 1223001
diff --git a/databases/libgda3/files/patch-doc::libgda-C.omf.in b/databases/libgda3/files/patch-doc::libgda-C.omf.in
index cc83c742bedd..f98b540c5562 100644
--- a/databases/libgda3/files/patch-doc::libgda-C.omf.in
+++ b/databases/libgda3/files/patch-doc::libgda-C.omf.in
@@ -1,11 +1,11 @@
---- doc/libgda-C.omf.in.orig Thu Oct 2 11:54:08 2003
-+++ doc/libgda-C.omf.in Thu Oct 2 11:54:58 2003
+--- doc/libgda-C.omf.in.orig Mon Feb 28 05:30:59 2005
++++ doc/libgda-C.omf.in Thu Mar 3 14:07:24 2005
@@ -16,7 +16,7 @@
</description>
<type>user's guide</type>
<format mime="text/html"/>
-- <identifier url="file:/@prefix@/share/gtk-doc/html/libgda/index.html"/>
-+ <identifier url="file:/@prefix@/share/doc/libgda/index.html"/>
+- <identifier url="file:@prefix@/share/gtk-doc/html/libgda/index.html"/>
++ <identifier url="file:@prefix@/share/doc/libgda/index.html"/>
<language code="C"/>
<relation seriesid="ebe4f574-a94d-11d6-8bc3-bd1f202a92f8"/>
<rights type="GNU FDL" license.version="1.1"/>
diff --git a/databases/libgda3/files/patch-doc_C_Makefile.in b/databases/libgda3/files/patch-doc_C_Makefile.in
index 718a4a1ebe6f..ef37c3190b54 100644
--- a/databases/libgda3/files/patch-doc_C_Makefile.in
+++ b/databases/libgda3/files/patch-doc_C_Makefile.in
@@ -1,11 +1,11 @@
---- doc/C/Makefile.in.orig Sun Jun 2 22:17:05 2002
-+++ doc/C/Makefile.in Sun Jun 2 22:17:27 2002
-@@ -152,7 +152,7 @@
- cxxflags_set = @cxxflags_set@
-
- DOC_MODULE = libgda
+--- doc/C/Makefile.in.orig Thu Jul 22 10:35:19 2004
++++ doc/C/Makefile.in Thu Jul 22 10:35:48 2004
+@@ -116,7 +116,7 @@
+ HISTORY_LIB = @HISTORY_LIB@
+ HISTORY_LIB_FALSE = @HISTORY_LIB_FALSE@
+ HISTORY_LIB_TRUE = @HISTORY_LIB_TRUE@
-HTML_DIR = $(datadir)/gtk-doc/html
+HTML_DIR = $(prefix)/share/doc
-
- # The top-level SGML file. Change it if you want.
- DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+ IBMDB2_CFLAGS = @IBMDB2_CFLAGS@
+ IBMDB2_FALSE = @IBMDB2_FALSE@
+ IBMDB2_LIBS = @IBMDB2_LIBS@
diff --git a/databases/libgda3/files/patch-libgda_gda-util.c b/databases/libgda3/files/patch-libgda_gda-util.c
deleted file mode 100644
index 61a7cded1fdb..000000000000
--- a/databases/libgda3/files/patch-libgda_gda-util.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgda/gda-util.c.orig Sat Jul 17 11:02:21 2004
-+++ libgda/gda-util.c Sat Jul 17 11:03:07 2004
-@@ -60,7 +60,7 @@
- case GDA_VALUE_TYPE_TIME : return "time";
- case GDA_VALUE_TYPE_TIMESTAMP : return "timestamp";
- case GDA_VALUE_TYPE_TINYINT : return "tinyint";
-- default:
-+ default: ;
- }
-
- return "string";
diff --git a/databases/libgda3/files/patch-ltmain.sh b/databases/libgda3/files/patch-ltmain.sh
deleted file mode 100644
index 860ddda642f7..000000000000
--- a/databases/libgda3/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig Tue Aug 5 18:08:30 2003
-+++ ltmain.sh Wed Aug 6 08:18:27 2003
-@@ -1278,7 +1278,7 @@
- esac
- elif test "X$arg" = "X-lc_r"; then
- case $host in
-- *-*-openbsd* | *-*-freebsd*)
-+ *-*-openbsd* | *-*-freebsd4*)
- # Do not include libc_r directly, use -pthread flag.
- continue
- ;;
-@@ -1288,8 +1288,16 @@
- continue
- ;;
-
-+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_flags="$compiler_flags -pthread"
-+ continue
-+ ;;
-+
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -3008,6 +3016,9 @@
- # problems, so we reset it completely
- verstring=
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- verstring="0.0"
- ;;
-@@ -5457,10 +5468,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/databases/libgda3/files/patch-po_Makefile.in.in b/databases/libgda3/files/patch-po_Makefile.in.in
new file mode 100644
index 000000000000..1e6984b6bbca
--- /dev/null
+++ b/databases/libgda3/files/patch-po_Makefile.in.in
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig Sat Aug 14 00:43:46 2004
++++ po/Makefile.in.in Sat Aug 14 00:45:54 2004
+@@ -35,6 +35,7 @@
+
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+
+ CC = @CC@
+ GENCAT = @GENCAT@
diff --git a/databases/libgda3/files/patch-providers_ldap_gda-ldap-provider.c b/databases/libgda3/files/patch-providers_ldap_gda-ldap-provider.c
deleted file mode 100644
index 182c120967dc..000000000000
--- a/databases/libgda3/files/patch-providers_ldap_gda-ldap-provider.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- providers/ldap/gda-ldap-provider.c.orig Sat Jul 17 11:06:48 2004
-+++ providers/ldap/gda-ldap-provider.c Sat Jul 17 11:06:57 2004
-@@ -275,7 +275,7 @@
- switch (feature) {
- case GDA_CONNECTION_FEATURE_SQL :
- return TRUE;
-- default :
-+ default : ;
- }
-
- return FALSE;
-@@ -466,7 +466,7 @@
- return get_ldap_tables (cnc, params);
- case GDA_CONNECTION_SCHEMA_TYPES :
- return get_ldap_types (cnc, params);
-- default :
-+ default : ;
- }
-
- return NULL;
diff --git a/databases/libgda3/files/patch-providers_mdb_gda-mdb-provider.c b/databases/libgda3/files/patch-providers_mdb_gda-mdb-provider.c
deleted file mode 100644
index a56a2df2a1a0..000000000000
--- a/databases/libgda3/files/patch-providers_mdb_gda-mdb-provider.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- providers/mdb/gda-mdb-provider.c.orig Sat Jul 17 11:05:48 2004
-+++ providers/mdb/gda-mdb-provider.c Sat Jul 17 11:06:12 2004
-@@ -389,7 +389,7 @@
- g_strfreev (arr);
- }
- break;
-- default :
-+ default : ;
- }
-
- return reclist;
-@@ -438,7 +438,7 @@
- case GDA_CONNECTION_FEATURE_PROCEDURES :
- case GDA_CONNECTION_FEATURE_SQL :
- return TRUE;
-- default :
-+ default : ;
- }
-
- return FALSE;
diff --git a/databases/libgda3/files/patch-providers_mysql_gda-mysql-provider.c b/databases/libgda3/files/patch-providers_mysql_gda-mysql-provider.c
deleted file mode 100644
index 4b13d3f74cb5..000000000000
--- a/databases/libgda3/files/patch-providers_mysql_gda-mysql-provider.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- patch-providers_mysql_gda-mysql-provider.c begins here ---
---- providers/mysql/gda-mysql-provider.c.orig Sat Aug 14 22:14:57 2004
-+++ providers/mysql/gda-mysql-provider.c Sat Aug 14 22:15:59 2004
-@@ -510,7 +510,7 @@
-
- g_free (str);
- break;
-- default:
-+ default: ;
- }
-
- return reclist;
-@@ -655,7 +655,7 @@
- case GDA_CONNECTION_FEATURE_SQL :
- case GDA_CONNECTION_FEATURE_TRANSACTIONS :
- return TRUE;
-- default :
-+ default : ;
- }
-
- return FALSE;
-@@ -1187,7 +1187,7 @@
- return get_mysql_tables (cnc, params);
- case GDA_CONNECTION_SCHEMA_TYPES :
- return get_mysql_types (cnc, params);
-- default :
-+ default : ;
- }
-
- return NULL;
diff --git a/databases/libgda3/files/patch-providers_mysql_gda-mysql-recordset.c b/databases/libgda3/files/patch-providers_mysql_gda-mysql-recordset.c
index 758d31ca4869..b0d7ad4862b1 100644
--- a/databases/libgda3/files/patch-providers_mysql_gda-mysql-recordset.c
+++ b/databases/libgda3/files/patch-providers_mysql_gda-mysql-recordset.c
@@ -1,11 +1,13 @@
---- providers/mysql/gda-mysql-recordset.c.orig Mon Feb 17 21:42:16 2003
-+++ providers/mysql/gda-mysql-recordset.c Mon Feb 17 21:42:57 2003
-@@ -102,7 +102,7 @@
- break;
- case FIELD_TYPE_LONGLONG :
- case FIELD_TYPE_INT24 :
-- gda_value_set_bigint (field, thevalue ? atoll (thevalue) : 0);
-+ gda_value_set_bigint (field, thevalue ? strtoll(thevalue, &thevalue, 10) : 0);
- break;
- case FIELD_TYPE_SHORT :
- gda_value_set_smallint (field, thevalue ? atoi (thevalue) : 0);
+--- providers/mysql/gda-mysql-recordset.c.orig Thu Jul 22 10:40:31 2004
++++ providers/mysql/gda-mysql-recordset.c Thu Jul 22 10:42:51 2004
+@@ -67,8 +67,8 @@
+ case FIELD_TYPE_LONGLONG :
+ case FIELD_TYPE_INT24 :
+ if (is_unsigned)
+- gda_value_set_biguint (gda_value, atoll (value));
+- gda_value_set_bigint (gda_value, atoll (value));
++ gda_value_set_biguint (gda_value, strtoll (value, &value, 10));
++ gda_value_set_bigint (gda_value, strtoll (value, &value, 10));
+ break;
+ case FIELD_TYPE_SHORT :
+ if (is_unsigned)
diff --git a/databases/libgda3/files/patch-providers_oracle_utils.c b/databases/libgda3/files/patch-providers_oracle_utils.c
deleted file mode 100644
index a38974770e24..000000000000
--- a/databases/libgda3/files/patch-providers_oracle_utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- providers/oracle/utils.c.orig Sat Jul 17 11:07:46 2004
-+++ providers/oracle/utils.c Sat Jul 17 11:08:12 2004
-@@ -110,7 +110,7 @@
- break;
- case OCI_HTYPE_ENV:
- gda_connection_add_error (cnc, gda_oracle_make_error (priv_data->henv, type, file, line));
-- default:
-+ default: ;
- }
- break;
- default:
diff --git a/databases/libgda3/files/patch-providers_sqlite_gda-sqlite-provider.c b/databases/libgda3/files/patch-providers_sqlite_gda-sqlite-provider.c
deleted file mode 100644
index 66454f222810..000000000000
--- a/databases/libgda3/files/patch-providers_sqlite_gda-sqlite-provider.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- providers/sqlite/gda-sqlite-provider.c.orig Sat Jul 17 11:09:00 2004
-+++ providers/sqlite/gda-sqlite-provider.c Sat Jul 17 11:09:07 2004
-@@ -623,7 +623,7 @@
- case GDA_CONNECTION_FEATURE_TRIGGERS :
- case GDA_CONNECTION_FEATURE_VIEWS :
- return TRUE;
-- default:
-+ default: ;
- }
-
- return FALSE;
-@@ -809,7 +809,7 @@
- return get_tables (cnc);
- case GDA_CONNECTION_SCHEMA_TYPES :
- return get_types ();
-- default:
-+ default: ;
- }
-
- return NULL;
diff --git a/databases/libgda3/files/patch-providers_xml_gda-xml-provider.c b/databases/libgda3/files/patch-providers_xml_gda-xml-provider.c
deleted file mode 100644
index 487d19514fc6..000000000000
--- a/databases/libgda3/files/patch-providers_xml_gda-xml-provider.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- providers/xml/gda-xml-provider.c.orig Sat Jul 17 11:05:02 2004
-+++ providers/xml/gda-xml-provider.c Sat Jul 17 11:05:11 2004
-@@ -681,7 +681,7 @@
- return get_tables (cnc, xmldb);
- case GDA_CONNECTION_SCHEMA_TYPES :
- return get_types (cnc);
-- default :
-+ default : ;
- }
-
- return NULL;
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
index 47a454eadc30..b2da31b8cbaa 100644
--- a/databases/libgda3/pkg-plist
+++ b/databases/libgda3/pkg-plist
@@ -2,79 +2,79 @@ bin/gda-config-tool
bin/gda-report-test
bin/gda-run
etc/libgda/config
-include/libgda-report/gda-report-document.h
-include/libgda-report/gda-report-item-detail.h
-include/libgda-report/gda-report-item-label.h
-include/libgda-report/gda-report-item-pagefooter.h
-include/libgda-report/gda-report-item-pageheader.h
-include/libgda-report/gda-report-item-repfield.h
-include/libgda-report/gda-report-item-report.h
-include/libgda-report/gda-report-item-reportfooter.h
-include/libgda-report/gda-report-item-reportheader.h
-include/libgda-report/gda-report-item-sqlquery.h
-include/libgda-report/gda-report-item.h
-include/libgda-report/gda-report-result.h
-include/libgda-report/gda-report-types.h
-include/libgda-report/gda-report-valid.h
-include/libgda-report/gda-report.h
-include/libgda/gda-blob.h
-include/libgda/gda-client.h
-include/libgda/gda-command.h
-include/libgda/gda-config.h
-include/libgda/gda-connection.h
-include/libgda/gda-data-model-array.h
-include/libgda/gda-data-model-hash.h
-include/libgda/gda-data-model-list.h
-include/libgda/gda-data-model.h
-include/libgda/gda-enum-types.h
-include/libgda/gda-error.h
-include/libgda/gda-export.h
-include/libgda/gda-field.h
-include/libgda/gda-log.h
-include/libgda/gda-marshal.h
-include/libgda/gda-parameter.h
-include/libgda/gda-quark-list.h
-include/libgda/gda-row.h
-include/libgda/gda-select.h
-include/libgda/gda-server-provider.h
-include/libgda/gda-table.h
-include/libgda/gda-transaction.h
-include/libgda/gda-util.h
-include/libgda/gda-value.h
-include/libgda/gda-xml-connection.h
-include/libgda/gda-xml-database.h
-include/libgda/gda-xml-document.h
-include/libgda/gda-xql-atom.h
-include/libgda/gda-xql-bin.h
-include/libgda/gda-xql-column.h
-include/libgda/gda-xql-const.h
-include/libgda/gda-xql-delete.h
-include/libgda/gda-xql-dml.h
-include/libgda/gda-xql-dual.h
-include/libgda/gda-xql-field.h
-include/libgda/gda-xql-func.h
-include/libgda/gda-xql-insert.h
-include/libgda/gda-xql-item.h
-include/libgda/gda-xql-join.h
-include/libgda/gda-xql-list.h
-include/libgda/gda-xql-query.h
-include/libgda/gda-xql-select.h
-include/libgda/gda-xql-stack.h
-include/libgda/gda-xql-target.h
-include/libgda/gda-xql-update.h
-include/libgda/gda-xql-utils.h
-include/libgda/gda-xql-value.h
-include/libgda/gda-xql-valueref.h
-include/libgda/libgda.h
+include/libgda-1.2/libgda-report/gda-report-document.h
+include/libgda-1.2/libgda-report/gda-report-item-detail.h
+include/libgda-1.2/libgda-report/gda-report-item-label.h
+include/libgda-1.2/libgda-report/gda-report-item-pagefooter.h
+include/libgda-1.2/libgda-report/gda-report-item-pageheader.h
+include/libgda-1.2/libgda-report/gda-report-item-repfield.h
+include/libgda-1.2/libgda-report/gda-report-item-report.h
+include/libgda-1.2/libgda-report/gda-report-item-reportfooter.h
+include/libgda-1.2/libgda-report/gda-report-item-reportheader.h
+include/libgda-1.2/libgda-report/gda-report-item-sqlquery.h
+include/libgda-1.2/libgda-report/gda-report-item.h
+include/libgda-1.2/libgda-report/gda-report-result.h
+include/libgda-1.2/libgda-report/gda-report-types.h
+include/libgda-1.2/libgda-report/gda-report-valid.h
+include/libgda-1.2/libgda-report/gda-report.h
+include/libgda-1.2/libgda/gda-blob.h
+include/libgda-1.2/libgda/gda-client.h
+include/libgda-1.2/libgda/gda-command.h
+include/libgda-1.2/libgda/gda-config.h
+include/libgda-1.2/libgda/gda-connection.h
+include/libgda-1.2/libgda/gda-data-model-array.h
+include/libgda-1.2/libgda/gda-data-model-hash.h
+include/libgda-1.2/libgda/gda-data-model-list.h
+include/libgda-1.2/libgda/gda-data-model.h
+include/libgda-1.2/libgda/gda-enum-types.h
+include/libgda-1.2/libgda/gda-error.h
+include/libgda-1.2/libgda/gda-field.h
+include/libgda-1.2/libgda/gda-log.h
+include/libgda-1.2/libgda/gda-marshal.h
+include/libgda-1.2/libgda/gda-parameter.h
+include/libgda-1.2/libgda/gda-quark-list.h
+include/libgda-1.2/libgda/gda-row.h
+include/libgda-1.2/libgda/gda-select.h
+include/libgda-1.2/libgda/gda-server-provider.h
+include/libgda-1.2/libgda/gda-table.h
+include/libgda-1.2/libgda/gda-transaction.h
+include/libgda-1.2/libgda/gda-util.h
+include/libgda-1.2/libgda/gda-value.h
+include/libgda-1.2/libgda/gda-xml-connection.h
+include/libgda-1.2/libgda/gda-xml-database.h
+include/libgda-1.2/libgda/gda-xml-document.h
+include/libgda-1.2/libgda/gda-xql-atom.h
+include/libgda-1.2/libgda/gda-xql-bin.h
+include/libgda-1.2/libgda/gda-xql-column.h
+include/libgda-1.2/libgda/gda-xql-const.h
+include/libgda-1.2/libgda/gda-xql-delete.h
+include/libgda-1.2/libgda/gda-xql-dml.h
+include/libgda-1.2/libgda/gda-xql-dual.h
+include/libgda-1.2/libgda/gda-xql-field.h
+include/libgda-1.2/libgda/gda-xql-func.h
+include/libgda-1.2/libgda/gda-xql-insert.h
+include/libgda-1.2/libgda/gda-xql-item.h
+include/libgda-1.2/libgda/gda-xql-join.h
+include/libgda-1.2/libgda/gda-xql-list.h
+include/libgda-1.2/libgda/gda-xql-query.h
+include/libgda-1.2/libgda/gda-xql-select.h
+include/libgda-1.2/libgda/gda-xql-stack.h
+include/libgda-1.2/libgda/gda-xql-target.h
+include/libgda-1.2/libgda/gda-xql-update.h
+include/libgda-1.2/libgda/gda-xql-utils.h
+include/libgda-1.2/libgda/gda-xql-value.h
+include/libgda-1.2/libgda/gda-xql-valueref.h
+include/libgda-1.2/libgda/libgda.h
+include/libgda-1.2/sql/sql_parser.h
lib/libgda-2.a
lib/libgda-2.so
-lib/libgda-2.so.2
+lib/libgda-2.so.3
lib/libgda-report-2.a
lib/libgda-report-2.so
-lib/libgda-report-2.so.2
+lib/libgda-report-2.so.3
lib/libgdasql.a
lib/libgdasql.so
-lib/libgdasql.so.0
+lib/libgdasql.so.3
%%FIREBIRD:%%lib/libgda/providers/libgda-firebird.so
%%FREETDS:%%lib/libgda/providers/libgda-freetds.so
%%LDAP:%%lib/libgda/providers/libgda-ldap.so
@@ -87,7 +87,10 @@ lib/libgdasql.so.0
lib/libgda/providers/libgda-xml.so
libdata/pkgconfig/libgda.pc
%%DOCSDIR%%/architecture.html
-%%DOCSDIR%%/c694.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/ch09s04.html
+%%DOCSDIR%%/ch09s05.html
+%%DOCSDIR%%/ch09s06.html
%%DOCSDIR%%/compiling.html
%%DOCSDIR%%/connecting.html
%%DOCSDIR%%/connections.html
@@ -104,13 +107,63 @@ libdata/pkgconfig/libgda.pc
%%DOCSDIR%%/fdl-section9.html
%%DOCSDIR%%/fdl-using.html
%%DOCSDIR%%/fdl.html
-%%DOCSDIR%%/gdavalue.html
+%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/installation-configuring.html
%%DOCSDIR%%/installation-installing.html
%%DOCSDIR%%/installation.html
%%DOCSDIR%%/introduction.html
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libgda.devhelp
+%%DOCSDIR%%/libgda-GdaClient.html
+%%DOCSDIR%%/libgda-GdaConnection.html
+%%DOCSDIR%%/libgda-GdaDataModel.html
+%%DOCSDIR%%/libgda-GdaDataModelArray.html
+%%DOCSDIR%%/libgda-GdaDataModelHash.html
+%%DOCSDIR%%/libgda-GdaDataModelList.html
+%%DOCSDIR%%/libgda-GdaError.html
+%%DOCSDIR%%/libgda-GdaExport.html
+%%DOCSDIR%%/libgda-GdaReportDocument.html
+%%DOCSDIR%%/libgda-GdaReportItem.html
+%%DOCSDIR%%/libgda-GdaReportItemDetail.html
+%%DOCSDIR%%/libgda-GdaReportItemLabel.html
+%%DOCSDIR%%/libgda-GdaReportItemPageFooter.html
+%%DOCSDIR%%/libgda-GdaReportItemPageHeader.html
+%%DOCSDIR%%/libgda-GdaReportItemRepField.html
+%%DOCSDIR%%/libgda-GdaReportItemReport.html
+%%DOCSDIR%%/libgda-GdaReportItemReportFooter.html
+%%DOCSDIR%%/libgda-GdaReportItemReportHeader.html
+%%DOCSDIR%%/libgda-GdaReportItemSqlQuery.html
+%%DOCSDIR%%/libgda-GdaReportResult.html
+%%DOCSDIR%%/libgda-GdaReportValid.html
+%%DOCSDIR%%/libgda-GdaSelect.html
+%%DOCSDIR%%/libgda-GdaServerProvider.html
+%%DOCSDIR%%/libgda-GdaTable.html
+%%DOCSDIR%%/libgda-GdaTransaction.html
+%%DOCSDIR%%/libgda-GdaXmlConnection.html
+%%DOCSDIR%%/libgda-GdaXmlDatabase.html
+%%DOCSDIR%%/libgda-GdaXmlDocument.html
+%%DOCSDIR%%/libgda-GdaXqlAtom.html
+%%DOCSDIR%%/libgda-GdaXqlBin.html
+%%DOCSDIR%%/libgda-GdaXqlColumn.html
+%%DOCSDIR%%/libgda-GdaXqlConst.html
+%%DOCSDIR%%/libgda-GdaXqlDelete.html
+%%DOCSDIR%%/libgda-GdaXqlDml.html
+%%DOCSDIR%%/libgda-GdaXqlDual.html
+%%DOCSDIR%%/libgda-GdaXqlField.html
+%%DOCSDIR%%/libgda-GdaXqlFunc.html
+%%DOCSDIR%%/libgda-GdaXqlInsert.html
+%%DOCSDIR%%/libgda-GdaXqlItem.html
+%%DOCSDIR%%/libgda-GdaXqlJoin.html
+%%DOCSDIR%%/libgda-GdaXqlList.html
+%%DOCSDIR%%/libgda-GdaXqlQuery.html
+%%DOCSDIR%%/libgda-GdaXqlSelect.html
+%%DOCSDIR%%/libgda-GdaXqlStack.html
+%%DOCSDIR%%/libgda-GdaXqlTarget.html
+%%DOCSDIR%%/libgda-GdaXqlUpdate.html
+%%DOCSDIR%%/libgda-GdaXqlValue.html
+%%DOCSDIR%%/libgda-GdaXqlValueRef.html
%%DOCSDIR%%/libgda-api.html
%%DOCSDIR%%/libgda-gda-blob.html
%%DOCSDIR%%/libgda-gda-command.html
@@ -124,69 +177,23 @@ libdata/pkgconfig/libgda.pc
%%DOCSDIR%%/libgda-gda-util.html
%%DOCSDIR%%/libgda-gda-value.html
%%DOCSDIR%%/libgda-gda-xql-utils.html
-%%DOCSDIR%%/libgda-gdaclient.html
-%%DOCSDIR%%/libgda-gdaconnection.html
-%%DOCSDIR%%/libgda-gdadatamodel.html
-%%DOCSDIR%%/libgda-gdadatamodelarray.html
-%%DOCSDIR%%/libgda-gdadatamodelhash.html
-%%DOCSDIR%%/libgda-gdadatamodellist.html
-%%DOCSDIR%%/libgda-gdaerror.html
-%%DOCSDIR%%/libgda-gdaexport.html
-%%DOCSDIR%%/libgda-gdareportdocument.html
-%%DOCSDIR%%/libgda-gdareportitem.html
-%%DOCSDIR%%/libgda-gdareportitemdetail.html
-%%DOCSDIR%%/libgda-gdareportitemlabel.html
-%%DOCSDIR%%/libgda-gdareportitempagefooter.html
-%%DOCSDIR%%/libgda-gdareportitempageheader.html
-%%DOCSDIR%%/libgda-gdareportitemrepfield.html
-%%DOCSDIR%%/libgda-gdareportitemreport.html
-%%DOCSDIR%%/libgda-gdareportitemreportfooter.html
-%%DOCSDIR%%/libgda-gdareportitemreportheader.html
-%%DOCSDIR%%/libgda-gdareportitemsqlquery.html
-%%DOCSDIR%%/libgda-gdareportresult.html
-%%DOCSDIR%%/libgda-gdareportvalid.html
-%%DOCSDIR%%/libgda-gdaselect.html
-%%DOCSDIR%%/libgda-gdaserverprovider.html
-%%DOCSDIR%%/libgda-gdatable.html
-%%DOCSDIR%%/libgda-gdatransaction.html
-%%DOCSDIR%%/libgda-gdaxmlconnection.html
-%%DOCSDIR%%/libgda-gdaxmldatabase.html
-%%DOCSDIR%%/libgda-gdaxmldocument.html
-%%DOCSDIR%%/libgda-gdaxqlatom.html
-%%DOCSDIR%%/libgda-gdaxqlbin.html
-%%DOCSDIR%%/libgda-gdaxqlcolumn.html
-%%DOCSDIR%%/libgda-gdaxqlconst.html
-%%DOCSDIR%%/libgda-gdaxqldelete.html
-%%DOCSDIR%%/libgda-gdaxqldml.html
-%%DOCSDIR%%/libgda-gdaxqldual.html
-%%DOCSDIR%%/libgda-gdaxqlfield.html
-%%DOCSDIR%%/libgda-gdaxqlfunc.html
-%%DOCSDIR%%/libgda-gdaxqlinsert.html
-%%DOCSDIR%%/libgda-gdaxqlitem.html
-%%DOCSDIR%%/libgda-gdaxqljoin.html
-%%DOCSDIR%%/libgda-gdaxqllist.html
-%%DOCSDIR%%/libgda-gdaxqlquery.html
-%%DOCSDIR%%/libgda-gdaxqlselect.html
-%%DOCSDIR%%/libgda-gdaxqlstack.html
-%%DOCSDIR%%/libgda-gdaxqltarget.html
-%%DOCSDIR%%/libgda-gdaxqlupdate.html
-%%DOCSDIR%%/libgda-gdaxqlvalue.html
-%%DOCSDIR%%/libgda-gdaxqlvalueref.html
%%DOCSDIR%%/libgda-libgda.html
%%DOCSDIR%%/libgda-provider-class.html
%%DOCSDIR%%/libgda-provider-recordset.html
%%DOCSDIR%%/libgda-providers.html
%%DOCSDIR%%/libgda-reports.html
+%%DOCSDIR%%/libgda-server-provider-details.html
%%DOCSDIR%%/libgda-xql.html
%%DOCSDIR%%/main_example.html
+%%DOCSDIR%%/manage-gdavalue.html
%%DOCSDIR%%/managing-errors.html
%%DOCSDIR%%/migration-configuration.html
%%DOCSDIR%%/migration-executing-commands.html
%%DOCSDIR%%/migration.html
%%DOCSDIR%%/processing-queries.html
-%%DOCSDIR%%/x863.html
-%%DOCSDIR%%/x892.html
-%%DOCSDIR%%/x897.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
share/gnome/libgda/xml/gda-report.dtd
share/gnome/libgda/xml/gda-report-result.dtd
share/gnome/libgda/xml/gda-xml-query.dtd
@@ -208,12 +215,12 @@ share/locale/ga/LC_MESSAGES/libgda-2.mo
share/locale/gl/LC_MESSAGES/libgda-2.mo
share/locale/hr/LC_MESSAGES/libgda-2.mo
share/locale/hu/LC_MESSAGES/libgda-2.mo
-share/locale/id/LC_MESSAGES/libgda-2.mo
share/locale/it/LC_MESSAGES/libgda-2.mo
share/locale/ja/LC_MESSAGES/libgda-2.mo
share/locale/ko/LC_MESSAGES/libgda-2.mo
share/locale/ml/LC_MESSAGES/libgda-2.mo
share/locale/ms/LC_MESSAGES/libgda-2.mo
+share/locale/nb/LC_MESSAGES/libgda-2.mo
share/locale/nl/LC_MESSAGES/libgda-2.mo
share/locale/no/LC_MESSAGES/libgda-2.mo
share/locale/pl/LC_MESSAGES/libgda-2.mo
@@ -222,6 +229,7 @@ share/locale/pt_BR/LC_MESSAGES/libgda-2.mo
share/locale/ru/LC_MESSAGES/libgda-2.mo
share/locale/sk/LC_MESSAGES/libgda-2.mo
share/locale/sl/LC_MESSAGES/libgda-2.mo
+share/locale/sq/LC_MESSAGES/libgda-2.mo
share/locale/sr/LC_MESSAGES/libgda-2.mo
share/locale/sr@Latn/LC_MESSAGES/libgda-2.mo
share/locale/sv/LC_MESSAGES/libgda-2.mo
@@ -235,7 +243,8 @@ share/locale/zh_TW/LC_MESSAGES/libgda-2.mo
@dirrm share/gnome/libgda
@dirrm lib/libgda/providers
@dirrm lib/libgda
-@dirrm include/libgda/sql
-@dirrm include/libgda
-@dirrm include/libgda-report
+@dirrm include/libgda-1.2/sql
+@dirrm include/libgda-1.2/libgda-report
+@dirrm include/libgda-1.2/libgda
+@dirrm include/libgda-1.2
@dirrm etc/libgda
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 18166163a64b..d82b6a0cd70c 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= libgnomedb
-PORTVERSION= 1.0.4
-PORTREVISION= 2
+PORTVERSION= 1.2.1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/libgnomedb/1.0
+MASTER_SITE_SUBDIR= sources/libgnomedb/1.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -20,8 +19,8 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgda2 gtksourceview \
- intlhack lthack
-USE_INC_LIBTOOL_VER= 13
+ intlhack
+USE_LIBTOOL_VER=15
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo
index 55a23e5cd28d..223a42243fa1 100644
--- a/databases/libgnomedb/distinfo
+++ b/databases/libgnomedb/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomedb-1.0.4.tar.bz2) = 956ddc8ddb3f4a2594a52b8a1b783f29
-SIZE (gnome2/libgnomedb-1.0.4.tar.bz2) = 621983
+MD5 (gnome2/libgnomedb-1.2.1.tar.bz2) = 5e2ff4eaa2bdb02493af4e21b5f5bf8b
+SIZE (gnome2/libgnomedb-1.2.1.tar.bz2) = 645167
diff --git a/databases/libgnomedb/files/patch-Makefile.in b/databases/libgnomedb/files/patch-Makefile.in
index ad0f1fd1b43e..c23a0014f8f1 100644
--- a/databases/libgnomedb/files/patch-Makefile.in
+++ b/databases/libgnomedb/files/patch-Makefile.in
@@ -1,12 +1,12 @@
---- Makefile.in.orig Sun Apr 18 16:19:21 2004
-+++ Makefile.in Sun Apr 18 16:19:38 2004
-@@ -212,8 +212,7 @@
-
- @BUILD_WITH_GNOME_TRUE@GNOME_DIRECTORY = control-center components monikers
-
--@ENABLE_GTK_DOC_TRUE@DOC_DIRECTORY = doc
+--- Makefile.in.orig Thu Jul 22 10:56:33 2004
++++ Makefile.in Thu Jul 22 10:57:14 2004
+@@ -251,8 +251,7 @@
+ @HAVE_LIBGLADE_TRUE@LIBGLADE_DIRECTORY = glade
+ @BUILD_WITH_GNOME_FALSE@GNOME_DIRECTORY =
+ @BUILD_WITH_GNOME_TRUE@GNOME_DIRECTORY = control-center
-@ENABLE_GTK_DOC_FALSE@DOC_DIRECTORY =
+-@ENABLE_GTK_DOC_TRUE@DOC_DIRECTORY = doc
+DOC_DIRECTORY = doc
-
SUBDIRS = \
po \
+ libgnomedb \
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-source-selector.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-source-selector.c
deleted file mode 100644
index b652611d1d51..000000000000
--- a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-source-selector.c
+++ /dev/null
@@ -1,37 +0,0 @@
-2004-04-18 Joe Marcus Clarke <marcus@FreeBSD.org>
-
-* libgnomedb/gnome-db-data-source-selector.c: (show_data_sources):
-
-Be sure to add something to the DSN menu so that this menu gets initialized.
-Failure to do so will cause a segmentation fault when trying to login to
-the database.
-
---- libgnomedb/gnome-db-data-source-selector.c.orig Sun Apr 18 21:41:59 2004
-+++ libgnomedb/gnome-db-data-source-selector.c Sun Apr 18 21:43:20 2004
-@@ -61,8 +61,25 @@
- dsn_info->name);
- gnome_db_config_free_data_source_info (dsn_info);
- }
-- else
-+ else {
-+ GList *dsn_list;
-+ GList *l;
-+
-+ /* load data sources */
-+ dsn_list = gnome_db_config_get_data_source_list ();
-+ for (l = dsn_list; l != NULL; l = l->next) {
-+ GdaDataSourceInfo *dsn_info = (GdaDataSourceInfo *) l->data;
-+
-+ if (!dsn_info)
-+ continue;
-+
-+ /* add the data source to the option menu */
-+ gnome_db_option_menu_add_item (GTK_OPTION_MENU (selector), dsn_info->name);
-+ }
-+
-+ gnome_db_config_free_data_source_list (dsn_list);
- gtk_option_menu_set_history (GTK_OPTION_MENU (selector), 0);
-+ }
- }
-
- /*
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
new file mode 100644
index 000000000000..27555ef8d7e3
--- /dev/null
+++ b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
@@ -0,0 +1,16 @@
+--- libgnomedb/gnome-db-find-dialog.c.orig Thu Jul 22 17:40:26 2004
++++ libgnomedb/gnome-db-find-dialog.c Thu Jul 22 17:41:02 2004
+@@ -216,11 +216,12 @@
+ GtkWidget *
+ gnome_db_find_dialog_new_with_model (const gchar *title, GdaDataModel *dm)
+ {
++ GnomeDbFindDialog *dialog;
+ g_return_val_if_fail (GDA_IS_DATA_MODEL (dm), NULL);
+
+ g_object_ref (dm);
+
+- GnomeDbFindDialog *dialog = gnome_db_find_dialog_new (title);
++ dialog = gnome_db_find_dialog_new (title);
+ gnome_db_find_dialog_add_fields_from_model (dialog, dm);
+
+ g_object_unref (dm);
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-form.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-form.c
deleted file mode 100644
index 392c7d06ec20..000000000000
--- a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-form.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomedb/gnome-db-form.c.orig Mon Aug 2 10:13:56 2004
-+++ libgnomedb/gnome-db-form.c Mon Aug 2 10:14:09 2004
-@@ -582,6 +582,6 @@
- form->priv->navigator_current_row = row;
- show_navigator_row (form);
- break;
-- case GNOME_DB_FORM_TYPE_LIST :
-+ case GNOME_DB_FORM_TYPE_LIST :;
- }
- }
diff --git a/databases/libgnomedb/files/patch-libgnomedb_utils.c b/databases/libgnomedb/files/patch-libgnomedb_utils.c
deleted file mode 100644
index 92979f008432..000000000000
--- a/databases/libgnomedb/files/patch-libgnomedb_utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomedb/utils.c.orig Mon Aug 2 10:12:06 2004
-+++ libgnomedb/utils.c Mon Aug 2 10:12:16 2004
-@@ -45,7 +45,7 @@
- dialog = gnome_db_error_dialog_new (_("Error"));
- gnome_db_error_dialog_show_errors (GNOME_DB_ERROR_DIALOG (dialog),
- gda_connection_get_errors (cnc));
-- default :
-+ default :;
- }
- }
-
diff --git a/databases/libgnomedb/files/patch-po::Makefile.in.in b/databases/libgnomedb/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..2e0e6e70ee75
--- /dev/null
+++ b/databases/libgnomedb/files/patch-po::Makefile.in.in
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig Thu Jul 22 11:06:21 2004
++++ po/Makefile.in.in Thu Jul 22 11:06:58 2004
+@@ -35,6 +35,7 @@
+
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+
+ CC = @CC@
+ GENCAT = @GENCAT@
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index a7c91a4d5591..0f6a2c9ef98d 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -1,91 +1,95 @@
bin/gnome-database-properties
-include/libgnomedb/gnome-db-browser.h
-include/libgnomedb/gnome-db-combo.h
-include/libgnomedb/gnome-db-config.h
-include/libgnomedb/gnome-db-connection-properties.h
-include/libgnomedb/gnome-db-connection-selector.h
-include/libgnomedb/gnome-db-control-widget.h
-include/libgnomedb/gnome-db-control.h
-include/libgnomedb/gnome-db-data-source-selector.h
-include/libgnomedb/gnome-db-dsn-config-druid.h
-include/libgnomedb/gnome-db-dsn-config.h
-include/libgnomedb/gnome-db-editor.h
-include/libgnomedb/gnome-db-error-dialog.h
-include/libgnomedb/gnome-db-error.h
-include/libgnomedb/gnome-db-form.h
-include/libgnomedb/gnome-db-gray-bar.h
-include/libgnomedb/gnome-db-grid.h
-include/libgnomedb/gnome-db-i18n.h
-include/libgnomedb/gnome-db-icon-list.h
-include/libgnomedb/gnome-db-list.h
-include/libgnomedb/gnome-db-login-dialog.h
-include/libgnomedb/gnome-db-login.h
-include/libgnomedb/gnome-db-model.h
-include/libgnomedb/gnome-db-provider-selector.h
-include/libgnomedb/gnome-db-query-builder.h
-include/libgnomedb/gnome-db-report-editor.h
-include/libgnomedb/gnome-db-stock.h
-include/libgnomedb/gnome-db-table-editor.h
-include/libgnomedb/gnome-db-util.h
-include/libgnomedb/libgnomedb.h
-lib/bonobo/monikers/libmoniker_database.so
+include/libgnomedb-1.2/libgnomedb/gnome-db-browser.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-combo.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-config.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-connection-properties.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-connection-selector.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-control-widget.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-control.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-data-source-selector.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-dsn-config-druid.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-dsn-config.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-editor.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-error-dialog.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-error.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-find-dialog.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-form.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-gray-bar.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-grid.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-i18n.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-icon-list.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-list.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-login-dialog.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-login.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-model.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-provider-selector.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-query-builder.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-report-editor.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-stock.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-table-editor.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-util.h
+include/libgnomedb-1.2/libgnomedb/libgnomedb.h
lib/libglade/2.0/libgnomedb.so
lib/libgnomedb-2.a
lib/libgnomedb-2.so
-lib/libgnomedb-2.so.3
+lib/libgnomedb-2.so.4
libdata/pkgconfig/libgnomedb.pc
-libdata/bonobo/servers/GNOME_Database_Components.server
-libdata/bonobo/servers/GNOME_Database_Monikers.server
-libexec/gnome-database-components
-%%DOCSDIR%%/fdl-section1.html
-%%DOCSDIR%%/fdl-section10.html
-%%DOCSDIR%%/fdl-section2.html
-%%DOCSDIR%%/fdl-section3.html
-%%DOCSDIR%%/fdl-section4.html
-%%DOCSDIR%%/fdl-section5.html
-%%DOCSDIR%%/fdl-section6.html
-%%DOCSDIR%%/fdl-section7.html
-%%DOCSDIR%%/fdl-section8.html
-%%DOCSDIR%%/fdl-section9.html
-%%DOCSDIR%%/fdl-using.html
-%%DOCSDIR%%/fdl.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/libgnomedb-basic.html
-%%DOCSDIR%%/libgnomedb-bonobo.html
-%%DOCSDIR%%/libgnomedb-gnome-db-config.html
-%%DOCSDIR%%/libgnomedb-gnome-db-model.html
-%%DOCSDIR%%/libgnomedb-gnome-db-stock.html
-%%DOCSDIR%%/libgnomedb-gnome-db-util.html
-%%DOCSDIR%%/libgnomedb-gnomedbbrowser.html
-%%DOCSDIR%%/libgnomedb-gnomedbcombo.html
-%%DOCSDIR%%/libgnomedb-gnomedbconnectionproperties.html
-%%DOCSDIR%%/libgnomedb-gnomedbconnectionselector.html
-%%DOCSDIR%%/libgnomedb-gnomedbcontrol.html
-%%DOCSDIR%%/libgnomedb-gnomedbcontrolwidget.html
-%%DOCSDIR%%/libgnomedb-gnomedbdatasourceselector.html
-%%DOCSDIR%%/libgnomedb-gnomedbdsnconfig.html
-%%DOCSDIR%%/libgnomedb-gnomedbdsnconfigdruid.html
-%%DOCSDIR%%/libgnomedb-gnomedbeditor.html
-%%DOCSDIR%%/libgnomedb-gnomedberror.html
-%%DOCSDIR%%/libgnomedb-gnomedberrordialog.html
-%%DOCSDIR%%/libgnomedb-gnomedbform.html
-%%DOCSDIR%%/libgnomedb-gnomedbgraybar.html
-%%DOCSDIR%%/libgnomedb-gnomedbgrid.html
-%%DOCSDIR%%/libgnomedb-gnomedbiconlist.html
-%%DOCSDIR%%/libgnomedb-gnomedblist.html
-%%DOCSDIR%%/libgnomedb-gnomedblogin.html
-%%DOCSDIR%%/libgnomedb-gnomedblogindialog.html
-%%DOCSDIR%%/libgnomedb-gnomedbproviderselector.html
-%%DOCSDIR%%/libgnomedb-gnomedbquerybuilder.html
-%%DOCSDIR%%/libgnomedb-gnomedbreporteditor.html
-%%DOCSDIR%%/libgnomedb-gnomedbtableeditor.html
-%%DOCSDIR%%/libgnomedb-gnomedbwindow.html
-%%DOCSDIR%%/libgnomedb-introduction.html
-%%DOCSDIR%%/libgnomedb-libgnomedb.html
-%%DOCSDIR%%/libgnomedb-widgets.html
share/gnome/control-center-2.0/capplets/database-properties.desktop
share/gnome/gnome-db/ui/db-shell.xml
+share/gnome/gtk-doc/html/libgnomedb/fdl-section1.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section10.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section2.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section3.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section4.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section5.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section6.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section7.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section8.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section9.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-using.html
+share/gnome/gtk-doc/html/libgnomedb/fdl.html
+share/gnome/gtk-doc/html/libgnomedb/home.png
+share/gnome/gtk-doc/html/libgnomedb/index.html
+share/gnome/gtk-doc/html/libgnomedb/index.sgml
+share/gnome/gtk-doc/html/libgnomedb/left.png
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbBrowser.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbCombo.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbConnectionProperties.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbConnectionSelector.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbControl.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbControlWidget.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDataSourceSelector.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDsnConfig.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDsnConfigDruid.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbEditor.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbError.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbErrorDialog.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbFindDialog.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbForm.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbGrayBar.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbGrid.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbIconList.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbList.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbLogin.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbLoginDialog.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbProviderSelector.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbQueryBuilder.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbReportEditor.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbTableEditor.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbWindow.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-basic.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-bonobo.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-config.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-model.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-stock.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-util.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-introduction.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-libgnomedb.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-widgets.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb.devhelp
+share/gnome/gtk-doc/html/libgnomedb/right.png
+share/gnome/gtk-doc/html/libgnomedb/style.css
+share/gnome/gtk-doc/html/libgnomedb/up.png
share/gnome/mime-info/libgnomedb.keys
share/gnome/mime-info/libgnomedb.mime
share/gnome/omf/libgnomedb/libgnomedb-C.omf
@@ -99,12 +103,15 @@ share/gnome/pixmaps/libgnomedb/gnome-db-database_24x24.png
share/gnome/pixmaps/libgnomedb/gnome-db-database_48x48.png
share/gnome/pixmaps/libgnomedb/gnome-db-designer_24x24.png
share/gnome/pixmaps/libgnomedb/gnome-db-disconnect_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-field_16x16.png
share/gnome/pixmaps/libgnomedb/gnome-db-indexes_16x16.png
share/gnome/pixmaps/libgnomedb/gnome-db-no-transaction_24x24.png
share/gnome/pixmaps/libgnomedb/gnome-db-procedures_16x16.png
share/gnome/pixmaps/libgnomedb/gnome-db-procedures_24x24.png
share/gnome/pixmaps/libgnomedb/gnome-db-query_16x16.png
share/gnome/pixmaps/libgnomedb/gnome-db-query_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-relations_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-relations_24x24.png
share/gnome/pixmaps/libgnomedb/gnome-db-rollback_24x24.png
share/gnome/pixmaps/libgnomedb/gnome-db-sequences_16x16.png
share/gnome/pixmaps/libgnomedb/gnome-db-sequences_24x24.png
@@ -136,12 +143,13 @@ share/locale/ga/LC_MESSAGES/libgnomedb-2.mo
share/locale/gl/LC_MESSAGES/libgnomedb-2.mo
share/locale/hr/LC_MESSAGES/libgnomedb-2.mo
share/locale/hu/LC_MESSAGES/libgnomedb-2.mo
-share/locale/id/LC_MESSAGES/libgnomedb-2.mo
share/locale/it/LC_MESSAGES/libgnomedb-2.mo
share/locale/ja/LC_MESSAGES/libgnomedb-2.mo
+share/locale/ka/LC_MESSAGES/libgnomedb-2.mo
share/locale/ko/LC_MESSAGES/libgnomedb-2.mo
share/locale/ml/LC_MESSAGES/libgnomedb-2.mo
share/locale/ms/LC_MESSAGES/libgnomedb-2.mo
+share/locale/nb/LC_MESSAGES/libgnomedb-2.mo
share/locale/nl/LC_MESSAGES/libgnomedb-2.mo
share/locale/no/LC_MESSAGES/libgnomedb-2.mo
share/locale/pl/LC_MESSAGES/libgnomedb-2.mo
@@ -150,6 +158,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnomedb-2.mo
share/locale/ru/LC_MESSAGES/libgnomedb-2.mo
share/locale/sk/LC_MESSAGES/libgnomedb-2.mo
share/locale/sl/LC_MESSAGES/libgnomedb-2.mo
+share/locale/sq/LC_MESSAGES/libgnomedb-2.mo
share/locale/sr/LC_MESSAGES/libgnomedb-2.mo
share/locale/sr@Latn/LC_MESSAGES/libgnomedb-2.mo
share/locale/sv/LC_MESSAGES/libgnomedb-2.mo
@@ -161,7 +170,10 @@ share/locale/zh_CN/LC_MESSAGES/libgnomedb-2.mo
share/locale/zh_TW/LC_MESSAGES/libgnomedb-2.mo
@dirrm share/gnome/pixmaps/libgnomedb
@dirrm share/gnome/omf/libgnomedb
+@dirrm share/gnome/gtk-doc/html/libgnomedb
+@unexec rmdir %D/share/gnome/gtk-doc/html 2> /dev/null || true
+@unexec rmdir %D/share/gnome/gtk-doc 2> /dev/null || true
@dirrm share/gnome/gnome-db/ui
@dirrm share/gnome/gnome-db
-@dirrm %%DOCSDIR%%
-@dirrm include/libgnomedb
+@dirrm include/libgnomedb-1.2/libgnomedb
+@dirrm include/libgnomedb-1.2
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 83797f1daf3c..fed889a3479d 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= mergeant
-PORTVERSION= 0.12.1
-PORTREVISION= 3
+PORTVERSION= 0.52
+PORTREVISION= 2
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.52
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -18,11 +18,12 @@ COMMENT= Provide uniform access to data sources for the GNOME 2 environment
USE_BZIP2= yes
USE_X_PREFIX= yes
-INSTALLS_OMF= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack libgnomedb libgnomeprintui
+USE_GNOME= gnomeprefix intlhack gnomehack libgnomedb libgnomeprintui
USE_PERL5= yes
-USE_LIBTOOL_VER= 15
+USE_LIBTOOL_VER=15
+INSTALLS_OMF= yes
+INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo
index dfe2c3e931bd..9289ea8c7364 100644
--- a/databases/mergeant/distinfo
+++ b/databases/mergeant/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/mergeant-0.12.1.tar.bz2) = 42a2f6778b81409db6cd1baa49663dca
-SIZE (gnome2/mergeant-0.12.1.tar.bz2) = 1204581
+MD5 (gnome2/mergeant-0.52.tar.bz2) = e9f96b824e452e9b9406b4c11f005b95
+SIZE (gnome2/mergeant-0.52.tar.bz2) = 2058623
diff --git a/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in b/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in
new file mode 100644
index 000000000000..52e62979ef48
--- /dev/null
+++ b/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/libmergeant/C/Makefile.in.orig Sat Aug 14 04:12:49 2004
++++ doc/libmergeant/C/Makefile.in Sat Aug 14 04:13:07 2004
+@@ -214,7 +214,7 @@
+
+ # The name of the module.
+ DOC_MODULE = libmergeant
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+
+ # The top-level SGML file.
+ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
diff --git a/databases/mergeant/files/patch-lib_Makefile.in b/databases/mergeant/files/patch-lib_Makefile.in
deleted file mode 100644
index f65cecae49d6..000000000000
--- a/databases/mergeant/files/patch-lib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Makefile.in.orig Sat Sep 14 18:40:05 2002
-+++ lib/Makefile.in Sat Sep 14 18:40:22 2002
-@@ -120,7 +120,7 @@
-
- noinst_LTLIBRARIES = libgdbshared.la
-
--INCLUDES = $(MERGEANT_CFLAGS) -DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" -DGNOMEDB_DATADIR=\""$(datadir)"\" -DGNOMEDB_LOCALEDIR=\""$(prefix)/share/locale"\"
-+INCLUDES = $(MERGEANT_CFLAGS) -DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" -DGNOMEDB_DATADIR=\""$(datadir)"\" -DGNOMEDB_LOCALEDIR=\""$(datadir)/locale"\"
-
-
- libgdbshared_headers = gnome-db-shortcut.h
diff --git a/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c b/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c
new file mode 100644
index 000000000000..15005003ecdb
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c
@@ -0,0 +1,17 @@
+--- libmergeant/graph/mg-canvas-field.c.orig Sat Aug 14 04:04:07 2004
++++ libmergeant/graph/mg-canvas-field.c Sat Aug 14 04:04:40 2004
+@@ -146,13 +146,13 @@
+ gpointer ptr;
+ GString *string;
+ MgServerDataType *dtype;
++ MgEntity *ent;
+
+ cf = MG_CANVAS_FIELD (object);
+
+ switch (param_id) {
+ case PROP_FIELD:
+ ptr = g_value_get_pointer (value);
+- MgEntity *ent;
+ g_return_if_fail (IS_MG_FIELD (ptr));
+
+ /* signals management */
diff --git a/databases/mergeant/files/patch-libmergeant_mg-form.c b/databases/mergeant/files/patch-libmergeant_mg-form.c
new file mode 100644
index 000000000000..168e15c413d3
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_mg-form.c
@@ -0,0 +1,19 @@
+--- libmergeant/mg-form.c.orig Thu Aug 12 22:24:32 2004
++++ libmergeant/mg-form.c Thu Aug 12 22:24:48 2004
+@@ -586,6 +586,7 @@
+ {
+ PangoAttrList *attrs = NULL;
+ PangoAttribute *att;
++ GSList *list;
+
+ if (show_mark) {
+ attrs = pango_attr_list_new ();
+@@ -595,7 +596,7 @@
+ pango_attr_list_insert (attrs, att);
+ }
+
+- GSList *list = form->priv->not_null_labels;
++ list = form->priv->not_null_labels;
+ while (list) {
+ gtk_label_set_attributes (GTK_LABEL (list->data), attrs);
+ list = g_slist_next (list);
diff --git a/databases/mergeant/files/patch-libmergeant_mg-parameter.c b/databases/mergeant/files/patch-libmergeant_mg-parameter.c
new file mode 100644
index 000000000000..60bfe9b4205c
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_mg-parameter.c
@@ -0,0 +1,13 @@
+--- libmergeant/mg-parameter.c.orig Thu Aug 12 22:25:38 2004
++++ libmergeant/mg-parameter.c Thu Aug 12 22:25:53 2004
+@@ -608,9 +608,9 @@
+ mg_parameter_set_value (MgParameter *param, const GdaValue *value)
+ {
+ gboolean changed = TRUE;
++ const GdaValue *current_val;
+ g_return_if_fail (param && IS_MG_PARAMETER (param));
+ g_return_if_fail (param->priv);
+- const GdaValue *current_val;
+
+ param->priv->invalid_forced = FALSE;
+
diff --git a/databases/mergeant/files/patch-libmergeant_mg-query.c b/databases/mergeant/files/patch-libmergeant_mg-query.c
new file mode 100644
index 000000000000..41bf5bf1a138
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_mg-query.c
@@ -0,0 +1,25 @@
+--- libmergeant/mg-query.c.orig Sun Aug 8 11:20:06 2004
++++ libmergeant/mg-query.c Wed Jan 5 02:07:47 2005
+@@ -44,7 +44,7 @@
+ #include "mg-server-aggregate.h"
+ #include "mg-data-handler.h"
+
+-#include <libgda/sql/sql_parser.h>
++#include <libgda-1.2/sql/sql_parser.h>
+ #include "mg-qf-func.h"
+
+ /*
+@@ -5117,9 +5117,11 @@
+ if (!cond)
+ has_error = TRUE;
+ else {
++ MgQfield *field_left;
++ MgQfield *field_right;
+ g_assert (mg_condition_get_cond_type (cond) == MG_CONDITION_LEAF_EQUAL);
+- MgQfield *field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT);
+- MgQfield *field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT);
++ field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT);
++ field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT);
+
+ if (IS_MG_QF_FIELD (field_left)) {
+ g_object_set (G_OBJECT (field_left), "value_provider", field_right, NULL);
diff --git a/databases/mergeant/files/patch-libmergeant_mg-work-grid.c b/databases/mergeant/files/patch-libmergeant_mg-work-grid.c
new file mode 100644
index 000000000000..b9a36b2e18d2
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_mg-work-grid.c
@@ -0,0 +1,14 @@
+--- libmergeant/mg-work-grid.c.orig Sat Aug 14 03:59:47 2004
++++ libmergeant/mg-work-grid.c Sat Aug 14 04:00:02 2004
+@@ -2299,10 +2299,10 @@
+ GtkTreeModel *tree_model, GtkTreeIter *iter,
+ MgWorkCore *core, MgDataEntryAttribute requested_status)
+ {
+- g_return_if_fail (user_modif);
+ guint attrs;
+ GtkTreePath *path;
+ gint row;
++ g_return_if_fail (user_modif);
+
+ switch (requested_status) {
+ case MG_DATA_ENTRY_IS_NULL:
diff --git a/databases/mergeant/files/patch-src_Makefile.in b/databases/mergeant/files/patch-src_Makefile.in
deleted file mode 100644
index 1e4f74872a9b..000000000000
--- a/databases/mergeant/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig Thu Jul 29 09:01:30 2004
-+++ src/Makefile.in Thu Jul 29 09:01:40 2004
-@@ -141,7 +141,7 @@
- mergeant_LDADD = $(MERGEANT_LIBS) $(top_builddir)/lib/libmergeant.la query-fields/libqueryfields.a
-
-
--mergeant_LDFLAGS = -export-dynamic -dlopen
-+mergeant_LDFLAGS = -export-dynamic
- mergeant_DEPENDENCIES = query-fields/libqueryfields.a
-
- DTD_FILES = mergeant.dtd
diff --git a/databases/mergeant/files/patch-src_interface_cb.c b/databases/mergeant/files/patch-src_interface_cb.c
deleted file mode 100644
index 6cbd2d2b3f63..000000000000
--- a/databases/mergeant/files/patch-src_interface_cb.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/interface_cb.c.orig Mon Aug 2 13:38:56 2004
-+++ src/interface_cb.c Mon Aug 2 13:39:10 2004
-@@ -2209,6 +2209,6 @@
- gnome_db_error_dialog_show_errors (GNOME_DB_ERROR_DIALOG (conf->error_dlg),
- gda_connection_get_errors (cnc));
- break;
-- default :
-+ default :;
- }
- }
diff --git a/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in b/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in
deleted file mode 100644
index 65ae9e7248d0..000000000000
--- a/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/netaddr/Makefile.in.orig Sat Sep 14 18:56:12 2002
-+++ src/plugins/netaddr/Makefile.in Sat Sep 14 18:57:13 2002
-@@ -125,7 +125,7 @@
- lib_LTLIBRARIES_PLUGIN = libPnetaddr.la
- libPnetaddr_la_SOURCES = netaddr.c baseplugin.h
- libPnetaddr_la_LIBADD =
--libPnetaddr_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0
-+libPnetaddr_la_LDFLAGS = -module -avoid-version -export-dynamic
-
- # Build a libtool library, for installation in libdir.
- lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN)
diff --git a/databases/mergeant/files/patch-src_plugins_picts_Makefile.in b/databases/mergeant/files/patch-src_plugins_picts_Makefile.in
deleted file mode 100644
index 3c54fdcd0135..000000000000
--- a/databases/mergeant/files/patch-src_plugins_picts_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/picts/Makefile.in.orig Sat Sep 14 18:57:58 2002
-+++ src/plugins/picts/Makefile.in Sat Sep 14 18:58:15 2002
-@@ -127,7 +127,7 @@
- libPpicts_la_SOURCES = picts_plugin.c baseplugin.h
- libPpicts_la_LIBADD =
-
--libPpicts_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0
-+libPpicts_la_LDFLAGS = -module -export-dynamic -avoid-version
-
- # Build a libtool library, libggnomedb.la for installation in libdir.
- lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN)
diff --git a/databases/mergeant/files/patch-src_plugins_sample_Makefile.in b/databases/mergeant/files/patch-src_plugins_sample_Makefile.in
deleted file mode 100644
index ae8b1158cd68..000000000000
--- a/databases/mergeant/files/patch-src_plugins_sample_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/sample/Makefile.in.orig Sat Sep 14 18:58:54 2002
-+++ src/plugins/sample/Makefile.in Sat Sep 14 18:59:04 2002
-@@ -127,7 +127,7 @@
- libPsample_la_SOURCES = sample_plugin.c baseplugin.h
- libPsample_la_LIBADD =
-
--libPsample_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0
-+libPsample_la_LDFLAGS = -module -export-dynamic -avoid-version
-
- # Build a libtool library, libggnomedb.la for installation in libdir.
- lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN)
diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist
index d4ade5f9bc46..75d763c41237 100644
--- a/databases/mergeant/pkg-plist
+++ b/databases/mergeant/pkg-plist
@@ -1,52 +1,252 @@
bin/mergeant
-lib/mergeant/plugins/libPnetaddr.so
-lib/mergeant/plugins/libPpicts.so
-lib/mergeant/plugins/libPsample.so
+bin/mg-db-browser
+bin/mg-test-dyn
+bin/mg-test-graph
+bin/mg-test-grapher
+bin/mg-test-handlers
+bin/mg-test-selector
+bin/mg-test-sqlquery
+bin/mg-test1
+bin/mg-test2
+bin/mg-test3
+bin/mg-verify-file
+include/libmergeant/graph/mg-canvas-cursor.h
+include/libmergeant/graph/mg-canvas-db-relations.h
+include/libmergeant/graph/mg-canvas-entity.h
+include/libmergeant/graph/mg-canvas-field.h
+include/libmergeant/graph/mg-canvas-fkconstraint.h
+include/libmergeant/graph/mg-canvas-item.h
+include/libmergeant/graph/mg-canvas-text.h
+include/libmergeant/graph/mg-canvas-tip.h
+include/libmergeant/graph/mg-canvas.h
+include/libmergeant/graph/mg-graph-item.h
+include/libmergeant/graph/mg-graph.h
+include/libmergeant/handlers/mg-data-cell-renderer-boolean.h
+include/libmergeant/handlers/mg-data-cell-renderer-combo.h
+include/libmergeant/handlers/mg-data-cell-renderer-info.h
+include/libmergeant/handlers/mg-data-cell-renderer-textual.h
+include/libmergeant/handlers/mg-entry-boolean.h
+include/libmergeant/handlers/mg-entry-combo.h
+include/libmergeant/handlers/mg-entry-none.h
+include/libmergeant/handlers/mg-entry-shell.h
+include/libmergeant/handlers/mg-entry-string.h
+include/libmergeant/handlers/mg-entry-time.h
+include/libmergeant/handlers/mg-entry-wrapper.h
+include/libmergeant/handlers/mg-handler-boolean.h
+include/libmergeant/handlers/mg-handler-none.h
+include/libmergeant/handlers/mg-handler-numerical.h
+include/libmergeant/handlers/mg-handler-string.h
+include/libmergeant/handlers/mg-handler-time.h
+include/libmergeant/libmergeant.h
+include/libmergeant/marshal.h
+include/libmergeant/mg-base.h
+include/libmergeant/mg-condition.h
+include/libmergeant/mg-conf.h
+include/libmergeant/mg-context.h
+include/libmergeant/mg-custom-layout.h
+include/libmergeant/mg-data-entry.h
+include/libmergeant/mg-data-handler.h
+include/libmergeant/mg-database.h
+include/libmergeant/mg-db-constraint.h
+include/libmergeant/mg-db-field.h
+include/libmergeant/mg-db-table.h
+include/libmergeant/mg-dbms-update-viewer.h
+include/libmergeant/mg-defs.h
+include/libmergeant/mg-entity.h
+include/libmergeant/mg-enums.h
+include/libmergeant/mg-field.h
+include/libmergeant/mg-form.h
+include/libmergeant/mg-graphviz.h
+include/libmergeant/mg-join.h
+include/libmergeant/mg-parameter.h
+include/libmergeant/mg-qf-all.h
+include/libmergeant/mg-qf-field.h
+include/libmergeant/mg-qf-func.h
+include/libmergeant/mg-qf-value.h
+include/libmergeant/mg-qfield.h
+include/libmergeant/mg-query.h
+include/libmergeant/mg-ref-base.h
+include/libmergeant/mg-referer.h
+include/libmergeant/mg-renderer.h
+include/libmergeant/mg-result-set.h
+include/libmergeant/mg-selector-private.h
+include/libmergeant/mg-selector.h
+include/libmergeant/mg-server-aggregate.h
+include/libmergeant/mg-server-data-type.h
+include/libmergeant/mg-server-function.h
+include/libmergeant/mg-server.h
+include/libmergeant/mg-target.h
+include/libmergeant/mg-util.h
+include/libmergeant/mg-work-core.h
+include/libmergeant/mg-work-form.h
+include/libmergeant/mg-work-grid.h
+include/libmergeant/mg-work-layout.h
+include/libmergeant/mg-work-matrix.h
+include/libmergeant/mg-work-widget.h
+include/libmergeant/mg-xml-storage.h
+include/libmergeant/missing.h
+include/libmergeant/sel-aggregates.h
+include/libmergeant/sel-data-types.h
+include/libmergeant/sel-forms.h
+include/libmergeant/sel-functions.h
+include/libmergeant/sel-graphs.h
+include/libmergeant/sel-onequery.h
+include/libmergeant/sel-onetable.h
+include/libmergeant/sel-onetarget.h
+include/libmergeant/sel-queries.h
+include/libmergeant/sel-tables.h
+include/libmergeant/utility.h
+lib/libmergeant-2.a
+lib/libmergeant-2.so
+lib/libmergeant-2.so.1
+lib/libmergeant_graph-2.a
+lib/libmergeant_graph-2.so
+lib/libmergeant_graph-2.so.1
+lib/libmergeant_handlers-2.a
+lib/libmergeant_handlers-2.so
+lib/libmergeant_handlers-2.so.1
+libdata/bonobo/servers/GNOME_Mergeant.server
+libdata/pkgconfig/libmergeant.pc
+share/doc/libmergeant/MgBase.html
+share/doc/libmergeant/MgCanvas.html
+share/doc/libmergeant/MgCanvasCursor.html
+share/doc/libmergeant/MgCanvasDbRelations.html
+share/doc/libmergeant/MgCanvasEntity.html
+share/doc/libmergeant/MgCanvasField.html
+share/doc/libmergeant/MgCanvasItem.html
+share/doc/libmergeant/MgCanvasText.html
+share/doc/libmergeant/MgCanvasTip.html
+share/doc/libmergeant/MgCondition.html
+share/doc/libmergeant/MgConf.html
+share/doc/libmergeant/MgContext.html
+share/doc/libmergeant/MgCustomLayout.html
+share/doc/libmergeant/MgDataCellRendererBoolean.html
+share/doc/libmergeant/MgDataCellRendererInfo.html
+share/doc/libmergeant/MgDataCellRendererTextual.html
+share/doc/libmergeant/MgDataEntry.html
+share/doc/libmergeant/MgDataHandler.html
+share/doc/libmergeant/MgDatabase.html
+share/doc/libmergeant/MgDbConstraint.html
+share/doc/libmergeant/MgDbField.html
+share/doc/libmergeant/MgDbTable.html
+share/doc/libmergeant/MgDbmsUpdateViewer.html
+share/doc/libmergeant/MgEntity.html
+share/doc/libmergeant/MgEntryBoolean.html
+share/doc/libmergeant/MgEntryCidr.html
+share/doc/libmergeant/MgEntryCombo.html
+share/doc/libmergeant/MgEntryNone.html
+share/doc/libmergeant/MgEntryPassmd5.html
+share/doc/libmergeant/MgEntryShell.html
+share/doc/libmergeant/MgEntryString.html
+share/doc/libmergeant/MgEntryTime.html
+share/doc/libmergeant/MgEntryWrapper.html
+share/doc/libmergeant/MgField.html
+share/doc/libmergeant/MgForm.html
+share/doc/libmergeant/MgGraph.html
+share/doc/libmergeant/MgGraphItem.html
+share/doc/libmergeant/MgGraphviz.html
+share/doc/libmergeant/MgHandlerBoolean.html
+share/doc/libmergeant/MgHandlerCidr.html
+share/doc/libmergeant/MgHandlerNone.html
+share/doc/libmergeant/MgHandlerNumerical.html
+share/doc/libmergeant/MgHandlerPassmd5.html
+share/doc/libmergeant/MgHandlerString.html
+share/doc/libmergeant/MgHandlerText.html
+share/doc/libmergeant/MgHandlerTime.html
+share/doc/libmergeant/MgJoin.html
+share/doc/libmergeant/MgParameter.html
+share/doc/libmergeant/MgQfAll.html
+share/doc/libmergeant/MgQfField.html
+share/doc/libmergeant/MgQfFunc.html
+share/doc/libmergeant/MgQfValue.html
+share/doc/libmergeant/MgQfield.html
+share/doc/libmergeant/MgQuery.html
+share/doc/libmergeant/MgRefBase.html
+share/doc/libmergeant/MgReferer.html
+share/doc/libmergeant/MgRenderer.html
+share/doc/libmergeant/MgResultSet.html
+share/doc/libmergeant/MgSelector.html
+share/doc/libmergeant/MgServer.html
+share/doc/libmergeant/MgServerAggregate.html
+share/doc/libmergeant/MgServerDataType.html
+share/doc/libmergeant/MgServerFunction.html
+share/doc/libmergeant/MgTarget.html
+share/doc/libmergeant/MgWorkCore.html
+share/doc/libmergeant/MgWorkForm.html
+share/doc/libmergeant/MgWorkGrid.html
+share/doc/libmergeant/MgWorkLayout.html
+share/doc/libmergeant/MgWorkMatrix.html
+share/doc/libmergeant/MgWorkWidget.html
+share/doc/libmergeant/MgXmlStorage.html
+share/doc/libmergeant/ch01.html
+share/doc/libmergeant/ch02.html
+share/doc/libmergeant/ch03.html
+share/doc/libmergeant/ch04.html
+share/doc/libmergeant/ch04s02.html
+share/doc/libmergeant/ch05.html
+share/doc/libmergeant/ch06.html
+share/doc/libmergeant/ch07.html
+share/doc/libmergeant/ch08.html
+share/doc/libmergeant/ch08s02.html
+share/doc/libmergeant/ch09.html
+share/doc/libmergeant/ch09s02.html
+share/doc/libmergeant/ch09s03.html
+share/doc/libmergeant/ch10.html
+share/doc/libmergeant/ch11.html
+share/doc/libmergeant/ch12.html
+share/doc/libmergeant/example_bad.png
+share/doc/libmergeant/example_result.png
+share/doc/libmergeant/home.png
+share/doc/libmergeant/index.html
+share/doc/libmergeant/index.sgml
+share/doc/libmergeant/left.png
+share/doc/libmergeant/libmergeant.devhelp
+share/doc/libmergeant/query01.png
+share/doc/libmergeant/right.png
+share/doc/libmergeant/up.png
share/gnome/application-registry/mergeant.applications
share/gnome/applications/mergeant.desktop
-share/gnome/help/mergeant/C/c137.html
-share/gnome/help/mergeant/C/c220.html
-share/gnome/help/mergeant/C/c25.html
-share/gnome/help/mergeant/C/c254.html
-share/gnome/help/mergeant/C/c342.html
-share/gnome/help/mergeant/C/c372.html
-share/gnome/help/mergeant/C/c375.html
-share/gnome/help/mergeant/C/f20.html
-share/gnome/help/mergeant/C/images/env_form.jpg
-share/gnome/help/mergeant/C/images/env_grid.jpg
-share/gnome/help/mergeant/C/images/env_prop.jpg
-share/gnome/help/mergeant/C/images/framework.eps
-share/gnome/help/mergeant/C/images/framework.fig
-share/gnome/help/mergeant/C/images/framework.jpg
-share/gnome/help/mergeant/C/images/gas.gif
-share/gnome/help/mergeant/C/images/main.jpg
-share/gnome/help/mergeant/C/images/plugins_dt.jpg
-share/gnome/help/mergeant/C/images/plugins_objects.jpg
-share/gnome/help/mergeant/C/images/plugins_sum.jpg
-share/gnome/help/mergeant/C/images/properties.jpg
-share/gnome/help/mergeant/C/images/queryprop.jpg
-share/gnome/help/mergeant/C/images/queryprop_cond.jpg
-share/gnome/help/mergeant/C/images/queryprop_joins.jpg
-share/gnome/help/mergeant/C/images/queryprop_objects.jpg
-share/gnome/help/mergeant/C/images/queryprop_sql.jpg
-share/gnome/help/mergeant/C/images/rels.jpg
-share/gnome/help/mergeant/C/images/sysinfo.jpg
+share/gnome/help/mergeant/C/book1.html
+share/gnome/help/mergeant/C/c13.html
+share/gnome/help/mergeant/C/c47.html
+share/gnome/help/mergeant/C/c68.html
+share/gnome/help/mergeant/C/c76.html
+share/gnome/help/mergeant/C/c8.html
+share/gnome/help/mergeant/C/c84.html
+share/gnome/help/mergeant/C/c94.html
+share/gnome/help/mergeant/C/images/datasources.png
+share/gnome/help/mergeant/C/images/dba_properties.png
+share/gnome/help/mergeant/C/images/workspace-data-types.png
+share/gnome/help/mergeant/C/images/workspace-graphs.png
+share/gnome/help/mergeant/C/images/workspace-queries.png
+share/gnome/help/mergeant/C/images/workspace.png
share/gnome/help/mergeant/C/index.html
+share/gnome/help/mergeant/C/stylesheet-images/caution.gif
+share/gnome/help/mergeant/C/stylesheet-images/home.gif
+share/gnome/help/mergeant/C/stylesheet-images/important.gif
+share/gnome/help/mergeant/C/stylesheet-images/next.gif
+share/gnome/help/mergeant/C/stylesheet-images/note.gif
+share/gnome/help/mergeant/C/stylesheet-images/prev.gif
+share/gnome/help/mergeant/C/stylesheet-images/tip.gif
+share/gnome/help/mergeant/C/stylesheet-images/toc-blank.gif
+share/gnome/help/mergeant/C/stylesheet-images/toc-minus.gif
+share/gnome/help/mergeant/C/stylesheet-images/toc-plus.gif
+share/gnome/help/mergeant/C/stylesheet-images/up.gif
+share/gnome/help/mergeant/C/stylesheet-images/warning.gif
share/gnome/help/mergeant/C/topic.dat
-share/gnome/help/mergeant/C/x110.html
-share/gnome/help/mergeant/C/x168.html
-share/gnome/help/mergeant/C/x210.html
-share/gnome/help/mergeant/C/x236.html
-share/gnome/help/mergeant/C/x245.html
-share/gnome/help/mergeant/C/x313.html
-share/gnome/help/mergeant/C/x32.html
-share/gnome/help/mergeant/C/x350.html
-share/gnome/help/mergeant/C/x66.html
-share/gnome/help/mergeant/C/x80.html
-share/gnome/help/mergeant/C/x92.html
-share/gnome/mergeant/dtd/mergeant.dtd
+share/gnome/help/mergeant/C/x19.html
+share/gnome/help/mergeant/C/x40.html
+share/gnome/mergeant/dtd/libmergeant.dtd
+share/gnome/mergeant/plugins/libmergeant_handler_cidr.so
+share/gnome/mergeant/plugins/libmergeant_handler_cidr.so.1
+share/gnome/mergeant/plugins/libmergeant_handler_passmd5.so
+share/gnome/mergeant/plugins/libmergeant_handler_passmd5.so.1
+share/gnome/mergeant/plugins/libmergeant_handler_text.so
+share/gnome/mergeant/plugins/libmergeant_handler_text.so.1
+share/gnome/mergeant/ui/mergeant.xml
share/gnome/mime-info/mergeant.keys
share/gnome/mime-info/mergeant.mime
+share/gnome/omf/libmergeant/libmergeant-C.omf
share/gnome/omf/mergeant/mergeant-C.omf
share/gnome/pixmaps/document-icons/gnome-application-x-mergeant.png
share/gnome/pixmaps/mergeant/mergeant.png
@@ -65,14 +265,20 @@ share/gnome/pixmaps/mergeant/query-view-query_16x16.png
share/gnome/pixmaps/mergeant/query-view-table_16x16.png
share/gnome/pixmaps/mergeant/query-view-view_16x16.png
share/locale/am/LC_MESSAGES/mergeant.mo
+share/locale/az/LC_MESSAGES/mergeant.mo
share/locale/ca/LC_MESSAGES/mergeant.mo
share/locale/cs/LC_MESSAGES/mergeant.mo
share/locale/da/LC_MESSAGES/mergeant.mo
share/locale/de/LC_MESSAGES/mergeant.mo
+share/locale/el/LC_MESSAGES/mergeant.mo
+share/locale/en_CA/LC_MESSAGES/mergeant.mo
+share/locale/en_GB/LC_MESSAGES/mergeant.mo
share/locale/es/LC_MESSAGES/mergeant.mo
share/locale/fa/LC_MESSAGES/mergeant.mo
share/locale/fr/LC_MESSAGES/mergeant.mo
+share/locale/hr/LC_MESSAGES/mergeant.mo
share/locale/it/LC_MESSAGES/mergeant.mo
+share/locale/ml/LC_MESSAGES/mergeant.mo
share/locale/ms/LC_MESSAGES/mergeant.mo
share/locale/nl/LC_MESSAGES/mergeant.mo
share/locale/no/LC_MESSAGES/mergeant.mo
@@ -87,13 +293,19 @@ share/locale/sv/LC_MESSAGES/mergeant.mo
share/locale/tr/LC_MESSAGES/mergeant.mo
share/locale/uk/LC_MESSAGES/mergeant.mo
share/locale/vi/LC_MESSAGES/mergeant.mo
+share/locale/zh_CN/LC_MESSAGES/mergeant.mo
@dirrm share/gnome/pixmaps/mergeant
@dirrm share/gnome/omf/mergeant
+@dirrm share/gnome/omf/libmergeant
+@dirrm share/gnome/mergeant/ui
+@dirrm share/gnome/mergeant/plugins
@dirrm share/gnome/mergeant/dtd
@dirrm share/gnome/mergeant
@dirrm share/gnome/help/mergeant/C/stylesheet-images
@dirrm share/gnome/help/mergeant/C/images
@dirrm share/gnome/help/mergeant/C
@dirrm share/gnome/help/mergeant
-@dirrm lib/mergeant/plugins
-@dirrm lib/mergeant
+@dirrm share/doc/libmergeant
+@dirrm include/libmergeant/handlers
+@dirrm include/libmergeant/graph
+@dirrm include/libmergeant
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 8f118a9f5748..d6e79dff9447 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= gnomeutils2
-PORTVERSION= 2.8.1
-PORTREVISION= 1
+PORTVERSION= 2.10.0
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-utils/2.8
+MASTER_SITE_SUBDIR= sources/gnome-utils/2.10
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -24,12 +23,21 @@ INSTALLS_OMF= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomepanel
+USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
+ libgnomeprintui gnomedesktop
USE_LIBTOOL_VER=15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
-GCONF_SCHEMAS= gdict.schemas gnome-search-tool.schemas logview.schemas
+GCONF_SCHEMAS= gdict.schemas gnome-screenshot.schemas \
+ gnome-search-tool.schemas logview.schemas
+
+post-extract:
+ @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's| $$||g'
+
+post-patch:
+ @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
.include <bsd.port.mk>
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index a5647e87561d..1e7ee27e21cb 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-utils-2.8.1.tar.bz2) = 048224275454781c7eebc5afd4004069
-SIZE (gnome2/gnome-utils-2.8.1.tar.bz2) = 1738576
+MD5 (gnome2/gnome-utils-2.10.0.tar.bz2) = 43644d28321645aa68428e99fadb2504
+SIZE (gnome2/gnome-utils-2.10.0.tar.bz2) = 2012166
diff --git a/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c b/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c
new file mode 100644
index 000000000000..0cc89594e169
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c
@@ -0,0 +1,29 @@
+--- gnome-screenshot/screenshot-save.c.orig Mon Nov 1 15:56:19 2004
++++ gnome-screenshot/screenshot-save.c Fri Dec 17 23:11:51 2004
+@@ -94,16 +94,20 @@
+ gchar *message = NULL;
+ gchar *error_message = NULL;
+ GtkWidget *dialog;
++ GIOStatus status;
+
+- g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
+- message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
+- dialog = gtk_message_dialog_new (NULL, 0,
++ status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
++ if (status == G_IO_STATUS_NORMAL)
++ {
++ message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
++ dialog = gtk_message_dialog_new (NULL, 0,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ message);
+- gtk_dialog_run (GTK_DIALOG (dialog));
+- gtk_widget_destroy (dialog);
+- exit (1);
++ gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++ exit (1);
++ }
+ }
+
+ (*save_callback) (save_user_data);
diff --git a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-callbacks.c b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-callbacks.c
new file mode 100644
index 000000000000..325e50a3548d
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-callbacks.c
@@ -0,0 +1,29 @@
+--- gsearchtool/gsearchtool-callbacks.c.orig Thu Dec 23 19:14:17 2004
++++ gsearchtool/gsearchtool-callbacks.c Thu Dec 23 19:15:55 2004
+@@ -54,9 +54,11 @@
+ quit_application (GSearchCommandDetails * command_details)
+ {
+ if (command_details->command_status == RUNNING) {
+- command_details->command_status = MAKE_IT_QUIT;
+ #ifdef HAVE_GETPGID
+ pid_t pgid;
++#endif
++ command_details->command_status = MAKE_IT_QUIT;
++#ifdef HAVE_GETPGID
+
+ pgid = getpgid (command_details->command_pid);
+
+@@ -122,10 +124,12 @@
+ GSearchWindow * gsearch = data;
+
+ if (gsearch->command_details->command_status == RUNNING) {
++#ifdef HAVE_GETPGID
++ pid_t pgid;
++#endif
+ gtk_widget_set_sensitive (gsearch->stop_button, FALSE);
+ gsearch->command_details->command_status = MAKE_IT_STOP;
+ #ifdef HAVE_GETPGID
+- pid_t pgid;
+
+ pgid = getpgid (gsearch->command_details->command_pid);
+
diff --git a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
new file mode 100644
index 000000000000..03a974c23aa4
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
@@ -0,0 +1,10 @@
+--- gsearchtool/gsearchtool-support.c.orig Thu Dec 23 19:13:28 2004
++++ gsearchtool/gsearchtool-support.c Thu Dec 23 19:13:38 2004
+@@ -30,6 +30,7 @@
+ #endif
+
+ #include <glib/gi18n.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include <gdk/gdkx.h>
+ #include <bonobo-activation/bonobo-activation.h>
diff --git a/deskutils/gnome-utils/files/patch-logview::log_repaint.c b/deskutils/gnome-utils/files/patch-logview::log_repaint.c
deleted file mode 100644
index 3944b8205b12..000000000000
--- a/deskutils/gnome-utils/files/patch-logview::log_repaint.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- logview/log_repaint.c 2001/11/23 16:01:55 1.1
-+++ logview/log_repaint.c 2001/11/23 16:02:30
-@@ -24,7 +24,9 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <string.h>
- #include <gnome.h>
- #include "logview.h"
diff --git a/deskutils/gnome-utils/files/patch-logview::logrtns.h b/deskutils/gnome-utils/files/patch-logview::logrtns.h
deleted file mode 100644
index a39ce6a77b82..000000000000
--- a/deskutils/gnome-utils/files/patch-logview::logrtns.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- logview/logrtns.h 2001/11/23 16:04:00 1.1
-+++ logview/logrtns.h 2001/11/23 16:04:14
-@@ -24,7 +24,9 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <string.h>
- #include "logview.h"
-
diff --git a/deskutils/gnome-utils/files/patch-logview_desc_db.c b/deskutils/gnome-utils/files/patch-logview_desc_db.c
new file mode 100644
index 000000000000..5b687f492e88
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_desc_db.c
@@ -0,0 +1,10 @@
+--- logview/desc_db.c.orig Wed Dec 1 16:45:13 2004
++++ logview/desc_db.c Wed Dec 1 16:45:25 2004
+@@ -21,6 +21,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include "logview.h"
+ #include "desc_db.h"
diff --git a/deskutils/gnome-utils/files/patch-logview_logview.c b/deskutils/gnome-utils/files/patch-logview_logview.c
index 942ed8a02d6b..4ac243d34e9a 100644
--- a/deskutils/gnome-utils/files/patch-logview_logview.c
+++ b/deskutils/gnome-utils/files/patch-logview_logview.c
@@ -1,37 +1,29 @@
---- logview/logview.c.orig Fri May 7 21:47:59 2004
-+++ logview/logview.c Wed Aug 4 18:40:24 2004
-@@ -781,7 +781,7 @@
+--- logview/logview.c.orig Tue Nov 30 00:29:01 2004
++++ logview/logview.c Tue Nov 30 00:30:44 2004
+@@ -656,7 +656,7 @@
if ( ! found) {
g_snprintf (full_name, sizeof (full_name),
- "%s/share/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-regexp.db", DATADIR);
++ "%s/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
if (access (full_name, R_OK) == 0) {
found = TRUE;
g_free (cfg->regexp_db_path);
-@@ -804,7 +804,7 @@
+@@ -678,7 +678,7 @@
if ( ! found) {
g_snprintf (full_name, sizeof (full_name),
- "%s/share/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-descript.db", DATADIR);
++ "%s/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
if (access (full_name, R_OK) == 0) {
found = TRUE;
g_free (cfg->descript_db_path);
-@@ -838,7 +838,7 @@
+@@ -709,7 +709,7 @@
if ( ! found) {
g_snprintf (full_name, sizeof (full_name),
- "%s/share/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-actions.db", DATADIR);
++ "%s/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
if (access (full_name, R_OK) == 0) {
found = TRUE;
g_free (cfg->action_db_path);
-@@ -922,6 +922,7 @@
- /* remove trailing newline */
- if (logfile[strlen(logfile)-1] == '\n')
- logfile[strlen(logfile)-1] = '\0';
-+ if (strcmp (logfile, "/dev/console") == 0) continue;
- fprintf(stderr, "Found a logfile: (%s)\n", logfile);
- return logfile;
- }
diff --git a/deskutils/gnome-utils/files/patch-logview_userprefs.c b/deskutils/gnome-utils/files/patch-logview_userprefs.c
new file mode 100644
index 000000000000..d93f8ae57fc2
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_userprefs.c
@@ -0,0 +1,10 @@
+--- logview/userprefs.c.orig Tue Nov 30 00:35:05 2004
++++ logview/userprefs.c Tue Nov 30 00:36:34 2004
+@@ -56,6 +56,7 @@
+ /* remove trailing newline */
+ if (logfile[strlen(logfile)-1] == '\n')
+ logfile[strlen(logfile)-1] = '\0';
++ if (strcmp (logfile, "/dev/console") == 0) continue;
+ return logfile;
+ }
+ }
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index cc90083672a7..9bb821653750 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -1,4 +1,6 @@
bin/gnome-dictionary
+bin/gnome-panel-screenshot
+bin/gnome-screenshot
bin/gnome-search-tool
bin/gnome-system-log
libdata/bonobo/servers/GNOME_GDictApplet.server
@@ -7,6 +9,7 @@ share/gnome/applications/gnome-dictionary.desktop
share/gnome/applications/gnome-search-tool.desktop
share/gnome/applications/gnome-system-log.desktop
share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml
+share/gnome/gnome-screenshot/glade/gnome-screenshot.glade
share/gnome/gnome-system-log/gnome-system-log-actions.db
share/gnome/gnome-system-log/gnome-system-log-descript.db
share/gnome/gnome-system-log/gnome-system-log-regexp.db
@@ -18,6 +21,10 @@ share/gnome/help/gnome-dictionary/ja/figures/gdict_applet.png
share/gnome/help/gnome-dictionary/ja/figures/gdict_window.png
share/gnome/help/gnome-dictionary/ja/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/ja/legal.xml
+share/gnome/help/gnome-dictionary/uk/figures/gdict_applet.png
+share/gnome/help/gnome-dictionary/uk/figures/gdict_window.png
+share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/uk/legal.xml
share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/C/legal.xml
@@ -39,6 +46,9 @@ share/gnome/help/gnome-search-tool/ko/legal.xml
share/gnome/help/gnome-search-tool/sv/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/sv/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/sv/legal.xml
+share/gnome/help/gnome-search-tool/uk/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/uk/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/uk/legal.xml
share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/zh_CN/legal.xml
@@ -72,6 +82,9 @@ share/gnome/help/gnome-system-log/ko/legal.xml
share/gnome/help/gnome-system-log/sv/figures/syslog_window.png
share/gnome/help/gnome-system-log/sv/gnome-system-log.xml
share/gnome/help/gnome-system-log/sv/legal.xml
+share/gnome/help/gnome-system-log/uk/figures/syslog_window.png
+share/gnome/help/gnome-system-log/uk/gnome-system-log.xml
+share/gnome/help/gnome-system-log/uk/legal.xml
share/gnome/help/gnome-system-log/zh_CN/figures/syslog_window.png
share/gnome/help/gnome-system-log/zh_CN/gnome-system-log.xml
share/gnome/help/gnome-system-log/zh_CN/legal.xml
@@ -80,6 +93,7 @@ share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml
share/gnome/help/gnome-system-log/zh_TW/legal.xml
share/gnome/omf/gnome-utils/gnome-dictionary-C.omf
share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf
+share/gnome/omf/gnome-utils/gnome-dictionary-uk.omf
share/gnome/omf/gnome-utils/gnome-search-tool-C.omf
share/gnome/omf/gnome-utils/gnome-search-tool-es.omf
share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf
@@ -87,6 +101,7 @@ share/gnome/omf/gnome-utils/gnome-search-tool-it.omf
share/gnome/omf/gnome-utils/gnome-search-tool-ja.omf
share/gnome/omf/gnome-utils/gnome-search-tool-ko.omf
share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf
+share/gnome/omf/gnome-utils/gnome-search-tool-uk.omf
share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf
share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf
share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf
@@ -98,6 +113,7 @@ share/gnome/omf/gnome-utils/gnome-system-log-it.omf
share/gnome/omf/gnome-utils/gnome-system-log-ja.omf
share/gnome/omf/gnome-utils/gnome-system-log-ko.omf
share/gnome/omf/gnome-utils/gnome-system-log-sv.omf
+share/gnome/omf/gnome-utils/gnome-system-log-uk.omf
share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf
share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf
share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
@@ -168,6 +184,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-system-log/zh_TW
@dirrm share/gnome/help/gnome-system-log/zh_CN/figures
@dirrm share/gnome/help/gnome-system-log/zh_CN
+@dirrm share/gnome/help/gnome-system-log/uk/figures
+@dirrm share/gnome/help/gnome-system-log/uk
@dirrm share/gnome/help/gnome-system-log/sv/figures
@dirrm share/gnome/help/gnome-system-log/sv
@dirrm share/gnome/help/gnome-system-log/ko/figures
@@ -191,6 +209,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-search-tool/zh_HK
@dirrm share/gnome/help/gnome-search-tool/zh_CN/figures
@dirrm share/gnome/help/gnome-search-tool/zh_CN
+@dirrm share/gnome/help/gnome-search-tool/uk/figures
+@dirrm share/gnome/help/gnome-search-tool/uk
@dirrm share/gnome/help/gnome-search-tool/sv/figures
@dirrm share/gnome/help/gnome-search-tool/sv
@dirrm share/gnome/help/gnome-search-tool/ko/figures
@@ -206,9 +226,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-search-tool/C/figures
@dirrm share/gnome/help/gnome-search-tool/C
@dirrm share/gnome/help/gnome-search-tool
+@dirrm share/gnome/help/gnome-dictionary/uk/figures
+@dirrm share/gnome/help/gnome-dictionary/uk
@dirrm share/gnome/help/gnome-dictionary/ja/figures
@dirrm share/gnome/help/gnome-dictionary/ja
@dirrm share/gnome/help/gnome-dictionary/C/figures
@dirrm share/gnome/help/gnome-dictionary/C
@dirrm share/gnome/help/gnome-dictionary
@dirrm share/gnome/gnome-system-log
+@dirrm share/gnome/gnome-screenshot/glade
+@dirrm share/gnome/gnome-screenshot
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 8f118a9f5748..d6e79dff9447 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= gnomeutils2
-PORTVERSION= 2.8.1
-PORTREVISION= 1
+PORTVERSION= 2.10.0
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-utils/2.8
+MASTER_SITE_SUBDIR= sources/gnome-utils/2.10
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -24,12 +23,21 @@ INSTALLS_OMF= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomepanel
+USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
+ libgnomeprintui gnomedesktop
USE_LIBTOOL_VER=15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
-GCONF_SCHEMAS= gdict.schemas gnome-search-tool.schemas logview.schemas
+GCONF_SCHEMAS= gdict.schemas gnome-screenshot.schemas \
+ gnome-search-tool.schemas logview.schemas
+
+post-extract:
+ @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's| $$||g'
+
+post-patch:
+ @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
.include <bsd.port.mk>
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index a5647e87561d..1e7ee27e21cb 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-utils-2.8.1.tar.bz2) = 048224275454781c7eebc5afd4004069
-SIZE (gnome2/gnome-utils-2.8.1.tar.bz2) = 1738576
+MD5 (gnome2/gnome-utils-2.10.0.tar.bz2) = 43644d28321645aa68428e99fadb2504
+SIZE (gnome2/gnome-utils-2.10.0.tar.bz2) = 2012166
diff --git a/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c b/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c
new file mode 100644
index 000000000000..0cc89594e169
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c
@@ -0,0 +1,29 @@
+--- gnome-screenshot/screenshot-save.c.orig Mon Nov 1 15:56:19 2004
++++ gnome-screenshot/screenshot-save.c Fri Dec 17 23:11:51 2004
+@@ -94,16 +94,20 @@
+ gchar *message = NULL;
+ gchar *error_message = NULL;
+ GtkWidget *dialog;
++ GIOStatus status;
+
+- g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
+- message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
+- dialog = gtk_message_dialog_new (NULL, 0,
++ status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
++ if (status == G_IO_STATUS_NORMAL)
++ {
++ message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
++ dialog = gtk_message_dialog_new (NULL, 0,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ message);
+- gtk_dialog_run (GTK_DIALOG (dialog));
+- gtk_widget_destroy (dialog);
+- exit (1);
++ gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++ exit (1);
++ }
+ }
+
+ (*save_callback) (save_user_data);
diff --git a/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-callbacks.c b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-callbacks.c
new file mode 100644
index 000000000000..325e50a3548d
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-callbacks.c
@@ -0,0 +1,29 @@
+--- gsearchtool/gsearchtool-callbacks.c.orig Thu Dec 23 19:14:17 2004
++++ gsearchtool/gsearchtool-callbacks.c Thu Dec 23 19:15:55 2004
+@@ -54,9 +54,11 @@
+ quit_application (GSearchCommandDetails * command_details)
+ {
+ if (command_details->command_status == RUNNING) {
+- command_details->command_status = MAKE_IT_QUIT;
+ #ifdef HAVE_GETPGID
+ pid_t pgid;
++#endif
++ command_details->command_status = MAKE_IT_QUIT;
++#ifdef HAVE_GETPGID
+
+ pgid = getpgid (command_details->command_pid);
+
+@@ -122,10 +124,12 @@
+ GSearchWindow * gsearch = data;
+
+ if (gsearch->command_details->command_status == RUNNING) {
++#ifdef HAVE_GETPGID
++ pid_t pgid;
++#endif
+ gtk_widget_set_sensitive (gsearch->stop_button, FALSE);
+ gsearch->command_details->command_status = MAKE_IT_STOP;
+ #ifdef HAVE_GETPGID
+- pid_t pgid;
+
+ pgid = getpgid (gsearch->command_details->command_pid);
+
diff --git a/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c
new file mode 100644
index 000000000000..03a974c23aa4
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c
@@ -0,0 +1,10 @@
+--- gsearchtool/gsearchtool-support.c.orig Thu Dec 23 19:13:28 2004
++++ gsearchtool/gsearchtool-support.c Thu Dec 23 19:13:38 2004
+@@ -30,6 +30,7 @@
+ #endif
+
+ #include <glib/gi18n.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include <gdk/gdkx.h>
+ #include <bonobo-activation/bonobo-activation.h>
diff --git a/deskutils/gnomeutils2/files/patch-logview::log_repaint.c b/deskutils/gnomeutils2/files/patch-logview::log_repaint.c
deleted file mode 100644
index 3944b8205b12..000000000000
--- a/deskutils/gnomeutils2/files/patch-logview::log_repaint.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- logview/log_repaint.c 2001/11/23 16:01:55 1.1
-+++ logview/log_repaint.c 2001/11/23 16:02:30
-@@ -24,7 +24,9 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <string.h>
- #include <gnome.h>
- #include "logview.h"
diff --git a/deskutils/gnomeutils2/files/patch-logview::logrtns.h b/deskutils/gnomeutils2/files/patch-logview::logrtns.h
deleted file mode 100644
index a39ce6a77b82..000000000000
--- a/deskutils/gnomeutils2/files/patch-logview::logrtns.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- logview/logrtns.h 2001/11/23 16:04:00 1.1
-+++ logview/logrtns.h 2001/11/23 16:04:14
-@@ -24,7 +24,9 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <string.h>
- #include "logview.h"
-
diff --git a/deskutils/gnomeutils2/files/patch-logview_desc_db.c b/deskutils/gnomeutils2/files/patch-logview_desc_db.c
new file mode 100644
index 000000000000..5b687f492e88
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_desc_db.c
@@ -0,0 +1,10 @@
+--- logview/desc_db.c.orig Wed Dec 1 16:45:13 2004
++++ logview/desc_db.c Wed Dec 1 16:45:25 2004
+@@ -21,6 +21,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include "logview.h"
+ #include "desc_db.h"
diff --git a/deskutils/gnomeutils2/files/patch-logview_logview.c b/deskutils/gnomeutils2/files/patch-logview_logview.c
index 942ed8a02d6b..4ac243d34e9a 100644
--- a/deskutils/gnomeutils2/files/patch-logview_logview.c
+++ b/deskutils/gnomeutils2/files/patch-logview_logview.c
@@ -1,37 +1,29 @@
---- logview/logview.c.orig Fri May 7 21:47:59 2004
-+++ logview/logview.c Wed Aug 4 18:40:24 2004
-@@ -781,7 +781,7 @@
+--- logview/logview.c.orig Tue Nov 30 00:29:01 2004
++++ logview/logview.c Tue Nov 30 00:30:44 2004
+@@ -656,7 +656,7 @@
if ( ! found) {
g_snprintf (full_name, sizeof (full_name),
- "%s/share/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-regexp.db", DATADIR);
++ "%s/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
if (access (full_name, R_OK) == 0) {
found = TRUE;
g_free (cfg->regexp_db_path);
-@@ -804,7 +804,7 @@
+@@ -678,7 +678,7 @@
if ( ! found) {
g_snprintf (full_name, sizeof (full_name),
- "%s/share/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-descript.db", DATADIR);
++ "%s/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
if (access (full_name, R_OK) == 0) {
found = TRUE;
g_free (cfg->descript_db_path);
-@@ -838,7 +838,7 @@
+@@ -709,7 +709,7 @@
if ( ! found) {
g_snprintf (full_name, sizeof (full_name),
- "%s/share/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-actions.db", DATADIR);
++ "%s/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
if (access (full_name, R_OK) == 0) {
found = TRUE;
g_free (cfg->action_db_path);
-@@ -922,6 +922,7 @@
- /* remove trailing newline */
- if (logfile[strlen(logfile)-1] == '\n')
- logfile[strlen(logfile)-1] = '\0';
-+ if (strcmp (logfile, "/dev/console") == 0) continue;
- fprintf(stderr, "Found a logfile: (%s)\n", logfile);
- return logfile;
- }
diff --git a/deskutils/gnomeutils2/files/patch-logview_userprefs.c b/deskutils/gnomeutils2/files/patch-logview_userprefs.c
new file mode 100644
index 000000000000..d93f8ae57fc2
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_userprefs.c
@@ -0,0 +1,10 @@
+--- logview/userprefs.c.orig Tue Nov 30 00:35:05 2004
++++ logview/userprefs.c Tue Nov 30 00:36:34 2004
+@@ -56,6 +56,7 @@
+ /* remove trailing newline */
+ if (logfile[strlen(logfile)-1] == '\n')
+ logfile[strlen(logfile)-1] = '\0';
++ if (strcmp (logfile, "/dev/console") == 0) continue;
+ return logfile;
+ }
+ }
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index cc90083672a7..9bb821653750 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -1,4 +1,6 @@
bin/gnome-dictionary
+bin/gnome-panel-screenshot
+bin/gnome-screenshot
bin/gnome-search-tool
bin/gnome-system-log
libdata/bonobo/servers/GNOME_GDictApplet.server
@@ -7,6 +9,7 @@ share/gnome/applications/gnome-dictionary.desktop
share/gnome/applications/gnome-search-tool.desktop
share/gnome/applications/gnome-system-log.desktop
share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml
+share/gnome/gnome-screenshot/glade/gnome-screenshot.glade
share/gnome/gnome-system-log/gnome-system-log-actions.db
share/gnome/gnome-system-log/gnome-system-log-descript.db
share/gnome/gnome-system-log/gnome-system-log-regexp.db
@@ -18,6 +21,10 @@ share/gnome/help/gnome-dictionary/ja/figures/gdict_applet.png
share/gnome/help/gnome-dictionary/ja/figures/gdict_window.png
share/gnome/help/gnome-dictionary/ja/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/ja/legal.xml
+share/gnome/help/gnome-dictionary/uk/figures/gdict_applet.png
+share/gnome/help/gnome-dictionary/uk/figures/gdict_window.png
+share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/uk/legal.xml
share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/C/legal.xml
@@ -39,6 +46,9 @@ share/gnome/help/gnome-search-tool/ko/legal.xml
share/gnome/help/gnome-search-tool/sv/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/sv/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/sv/legal.xml
+share/gnome/help/gnome-search-tool/uk/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/uk/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/uk/legal.xml
share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/zh_CN/legal.xml
@@ -72,6 +82,9 @@ share/gnome/help/gnome-system-log/ko/legal.xml
share/gnome/help/gnome-system-log/sv/figures/syslog_window.png
share/gnome/help/gnome-system-log/sv/gnome-system-log.xml
share/gnome/help/gnome-system-log/sv/legal.xml
+share/gnome/help/gnome-system-log/uk/figures/syslog_window.png
+share/gnome/help/gnome-system-log/uk/gnome-system-log.xml
+share/gnome/help/gnome-system-log/uk/legal.xml
share/gnome/help/gnome-system-log/zh_CN/figures/syslog_window.png
share/gnome/help/gnome-system-log/zh_CN/gnome-system-log.xml
share/gnome/help/gnome-system-log/zh_CN/legal.xml
@@ -80,6 +93,7 @@ share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml
share/gnome/help/gnome-system-log/zh_TW/legal.xml
share/gnome/omf/gnome-utils/gnome-dictionary-C.omf
share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf
+share/gnome/omf/gnome-utils/gnome-dictionary-uk.omf
share/gnome/omf/gnome-utils/gnome-search-tool-C.omf
share/gnome/omf/gnome-utils/gnome-search-tool-es.omf
share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf
@@ -87,6 +101,7 @@ share/gnome/omf/gnome-utils/gnome-search-tool-it.omf
share/gnome/omf/gnome-utils/gnome-search-tool-ja.omf
share/gnome/omf/gnome-utils/gnome-search-tool-ko.omf
share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf
+share/gnome/omf/gnome-utils/gnome-search-tool-uk.omf
share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf
share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf
share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf
@@ -98,6 +113,7 @@ share/gnome/omf/gnome-utils/gnome-system-log-it.omf
share/gnome/omf/gnome-utils/gnome-system-log-ja.omf
share/gnome/omf/gnome-utils/gnome-system-log-ko.omf
share/gnome/omf/gnome-utils/gnome-system-log-sv.omf
+share/gnome/omf/gnome-utils/gnome-system-log-uk.omf
share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf
share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf
share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
@@ -168,6 +184,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-system-log/zh_TW
@dirrm share/gnome/help/gnome-system-log/zh_CN/figures
@dirrm share/gnome/help/gnome-system-log/zh_CN
+@dirrm share/gnome/help/gnome-system-log/uk/figures
+@dirrm share/gnome/help/gnome-system-log/uk
@dirrm share/gnome/help/gnome-system-log/sv/figures
@dirrm share/gnome/help/gnome-system-log/sv
@dirrm share/gnome/help/gnome-system-log/ko/figures
@@ -191,6 +209,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-search-tool/zh_HK
@dirrm share/gnome/help/gnome-search-tool/zh_CN/figures
@dirrm share/gnome/help/gnome-search-tool/zh_CN
+@dirrm share/gnome/help/gnome-search-tool/uk/figures
+@dirrm share/gnome/help/gnome-search-tool/uk
@dirrm share/gnome/help/gnome-search-tool/sv/figures
@dirrm share/gnome/help/gnome-search-tool/sv
@dirrm share/gnome/help/gnome-search-tool/ko/figures
@@ -206,9 +226,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-search-tool/C/figures
@dirrm share/gnome/help/gnome-search-tool/C
@dirrm share/gnome/help/gnome-search-tool
+@dirrm share/gnome/help/gnome-dictionary/uk/figures
+@dirrm share/gnome/help/gnome-dictionary/uk
@dirrm share/gnome/help/gnome-dictionary/ja/figures
@dirrm share/gnome/help/gnome-dictionary/ja
@dirrm share/gnome/help/gnome-dictionary/C/figures
@dirrm share/gnome/help/gnome-dictionary/C
@dirrm share/gnome/help/gnome-dictionary
@dirrm share/gnome/gnome-system-log
+@dirrm share/gnome/gnome-screenshot/glade
+@dirrm share/gnome/gnome-screenshot
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index f06ccc438678..ae4b62d0e793 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -6,32 +6,36 @@
#
PORTNAME= bugbuddy
-PORTVERSION= 2.8.0
-PORTREVISION= 3
+PORTVERSION= 2.10.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/bug-buddy/2.8
+MASTER_SITE_SUBDIR= sources/bug-buddy/2.10
DISTNAME= bug-buddy-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A bug reporting tool for GNOME 2
+BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
+RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
+
USE_BZIP2= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_LIBTOOL_VER=15
-USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils
+USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \
+ desktopfileutils
GNOME_DESKTOP_VERSION=2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help
MAN1= bug-buddy.1
GCONF_SCHEMAS= bug-buddy.schemas
post-install:
- @-update-desktop-database > /dev/null
+ @-update-desktop-database
.include <bsd.port.mk>
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index 0b776637feb8..d7003e3d31ca 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/bug-buddy-2.8.0.tar.bz2) = b4c90bb9e1762803d083026b000349ea
-SIZE (gnome2/bug-buddy-2.8.0.tar.bz2) = 711303
+MD5 (gnome2/bug-buddy-2.10.0.tar.bz2) = c821a933f3d7be64071c7bfcb07ee1ac
+SIZE (gnome2/bug-buddy-2.10.0.tar.bz2) = 718182
diff --git a/devel/bug-buddy/files/patch-docs_C_bug-buddy-C.omf b/devel/bug-buddy/files/patch-docs_C_bug-buddy-C.omf
deleted file mode 100644
index 1388788efaf5..000000000000
--- a/devel/bug-buddy/files/patch-docs_C_bug-buddy-C.omf
+++ /dev/null
@@ -1,12 +0,0 @@
---- docs/C/bug-buddy-C.omf.orig Tue Nov 9 21:19:52 2004
-+++ docs/C/bug-buddy-C.omf Tue Nov 9 21:19:57 2004
-@@ -3,8 +3,8 @@
- <resource>
- <creator>baudais@kkpsi.org (Eric Baudais)</creator>
- <creator>telsa@linuxchix.org (Telsa Gwynne)</creator>
-- <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor>
- <maintainer>docs@gnome.org (GNOME Documentation Project)</maintainer>
-+ <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor>
- <title>Bug Buddy Manual</title>
- <date>September 11, 2004</date>
- <version identifier="2.8" date="2004-09-11" description="Updated to bug buddy 2.8"/>
diff --git a/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in b/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in
new file mode 100644
index 000000000000..1074dd7520d2
--- /dev/null
+++ b/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in
@@ -0,0 +1,12 @@
+--- docs/bug-buddy.omf.in.orig Fri Feb 11 14:23:02 2005
++++ docs/bug-buddy.omf.in Fri Feb 11 14:22:48 2005
+@@ -0,0 +1,9 @@
++<?xml version="1.0" standalone="no"?>
++<omf>
++ <resource>
++ <subject category="GNOME|Development"/>
++ <type>user's guide</type>
++ <relation seriesid="69b6f5ee-6cc5-11d6-8051-fe97a46511fa"/>
++ <rights type="GNU FDL" license.version="1.1" holder="Eric Baudais"/>
++ </resource>
++</omf>
diff --git a/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c b/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c
new file mode 100644
index 000000000000..bc0a6ba22c2f
--- /dev/null
+++ b/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c
@@ -0,0 +1,10 @@
+--- src/united-states-of-bug-buddy.c.orig Tue Nov 30 18:21:10 2004
++++ src/united-states-of-bug-buddy.c Tue Nov 30 18:21:15 2004
+@@ -36,6 +36,7 @@
+ #include <sys/types.h>
+ #include <sysexits.h>
+ #include <sys/wait.h>
++#include <signal.h>
+
+ #if 0
+ static char *help_pages[] = {
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index cd4e2b3e301c..16d22f537467 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -1,8 +1,8 @@
bin/bug-buddy
share/gnome/application-registry/bug-buddy.applications
share/gnome/applications/bug-buddy-core.desktop
-share/gnome/applications/bug-buddy.desktop
@exec update-desktop-database > /dev/null || /usr/bin/true
+share/gnome/applications/bug-buddy.desktop
share/gnome/bug-buddy/bug-buddy.glade
share/gnome/bug-buddy/bug-buddy.png
share/gnome/bug-buddy/bugzilla/gnome.bugzilla
@@ -61,6 +61,7 @@ share/locale/ml/LC_MESSAGES/bug-buddy.mo
share/locale/mn/LC_MESSAGES/bug-buddy.mo
share/locale/ms/LC_MESSAGES/bug-buddy.mo
share/locale/nb/LC_MESSAGES/bug-buddy.mo
+share/locale/ne/LC_MESSAGES/bug-buddy.mo
share/locale/nl/LC_MESSAGES/bug-buddy.mo
share/locale/nn/LC_MESSAGES/bug-buddy.mo
share/locale/no/LC_MESSAGES/bug-buddy.mo
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index f06ccc438678..ae4b62d0e793 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -6,32 +6,36 @@
#
PORTNAME= bugbuddy
-PORTVERSION= 2.8.0
-PORTREVISION= 3
+PORTVERSION= 2.10.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/bug-buddy/2.8
+MASTER_SITE_SUBDIR= sources/bug-buddy/2.10
DISTNAME= bug-buddy-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A bug reporting tool for GNOME 2
+BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
+RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
+
USE_BZIP2= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_LIBTOOL_VER=15
-USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils
+USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \
+ desktopfileutils
GNOME_DESKTOP_VERSION=2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help
MAN1= bug-buddy.1
GCONF_SCHEMAS= bug-buddy.schemas
post-install:
- @-update-desktop-database > /dev/null
+ @-update-desktop-database
.include <bsd.port.mk>
diff --git a/devel/bugbuddy/distinfo b/devel/bugbuddy/distinfo
index 0b776637feb8..d7003e3d31ca 100644
--- a/devel/bugbuddy/distinfo
+++ b/devel/bugbuddy/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/bug-buddy-2.8.0.tar.bz2) = b4c90bb9e1762803d083026b000349ea
-SIZE (gnome2/bug-buddy-2.8.0.tar.bz2) = 711303
+MD5 (gnome2/bug-buddy-2.10.0.tar.bz2) = c821a933f3d7be64071c7bfcb07ee1ac
+SIZE (gnome2/bug-buddy-2.10.0.tar.bz2) = 718182
diff --git a/devel/bugbuddy/files/patch-docs_C_bug-buddy-C.omf b/devel/bugbuddy/files/patch-docs_C_bug-buddy-C.omf
deleted file mode 100644
index 1388788efaf5..000000000000
--- a/devel/bugbuddy/files/patch-docs_C_bug-buddy-C.omf
+++ /dev/null
@@ -1,12 +0,0 @@
---- docs/C/bug-buddy-C.omf.orig Tue Nov 9 21:19:52 2004
-+++ docs/C/bug-buddy-C.omf Tue Nov 9 21:19:57 2004
-@@ -3,8 +3,8 @@
- <resource>
- <creator>baudais@kkpsi.org (Eric Baudais)</creator>
- <creator>telsa@linuxchix.org (Telsa Gwynne)</creator>
-- <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor>
- <maintainer>docs@gnome.org (GNOME Documentation Project)</maintainer>
-+ <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor>
- <title>Bug Buddy Manual</title>
- <date>September 11, 2004</date>
- <version identifier="2.8" date="2004-09-11" description="Updated to bug buddy 2.8"/>
diff --git a/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in b/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in
new file mode 100644
index 000000000000..1074dd7520d2
--- /dev/null
+++ b/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in
@@ -0,0 +1,12 @@
+--- docs/bug-buddy.omf.in.orig Fri Feb 11 14:23:02 2005
++++ docs/bug-buddy.omf.in Fri Feb 11 14:22:48 2005
+@@ -0,0 +1,9 @@
++<?xml version="1.0" standalone="no"?>
++<omf>
++ <resource>
++ <subject category="GNOME|Development"/>
++ <type>user's guide</type>
++ <relation seriesid="69b6f5ee-6cc5-11d6-8051-fe97a46511fa"/>
++ <rights type="GNU FDL" license.version="1.1" holder="Eric Baudais"/>
++ </resource>
++</omf>
diff --git a/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c b/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c
new file mode 100644
index 000000000000..bc0a6ba22c2f
--- /dev/null
+++ b/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c
@@ -0,0 +1,10 @@
+--- src/united-states-of-bug-buddy.c.orig Tue Nov 30 18:21:10 2004
++++ src/united-states-of-bug-buddy.c Tue Nov 30 18:21:15 2004
+@@ -36,6 +36,7 @@
+ #include <sys/types.h>
+ #include <sysexits.h>
+ #include <sys/wait.h>
++#include <signal.h>
+
+ #if 0
+ static char *help_pages[] = {
diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist
index cd4e2b3e301c..16d22f537467 100644
--- a/devel/bugbuddy/pkg-plist
+++ b/devel/bugbuddy/pkg-plist
@@ -1,8 +1,8 @@
bin/bug-buddy
share/gnome/application-registry/bug-buddy.applications
share/gnome/applications/bug-buddy-core.desktop
-share/gnome/applications/bug-buddy.desktop
@exec update-desktop-database > /dev/null || /usr/bin/true
+share/gnome/applications/bug-buddy.desktop
share/gnome/bug-buddy/bug-buddy.glade
share/gnome/bug-buddy/bug-buddy.png
share/gnome/bug-buddy/bugzilla/gnome.bugzilla
@@ -61,6 +61,7 @@ share/locale/ml/LC_MESSAGES/bug-buddy.mo
share/locale/mn/LC_MESSAGES/bug-buddy.mo
share/locale/ms/LC_MESSAGES/bug-buddy.mo
share/locale/nb/LC_MESSAGES/bug-buddy.mo
+share/locale/ne/LC_MESSAGES/bug-buddy.mo
share/locale/nl/LC_MESSAGES/bug-buddy.mo
share/locale/nn/LC_MESSAGES/bug-buddy.mo
share/locale/no/LC_MESSAGES/bug-buddy.mo
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index de9618dd1fcd..95438dda0a76 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gconf2
-PORTVERSION= 2.8.1
-PORTREVISION= 1
+PORTVERSION= 2.10.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/GConf/2.8
+MASTER_SITE_SUBDIR= sources/GConf/2.10
DISTNAME= GConf-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,7 +19,7 @@ COMMENT= A configuration database system for GNOME
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomehack gnomehier orbit2 gtk20 libxml2 linc
+USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc
INSTALLS_SHLIB= yes
USE_LIBTOOL_VER=15
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index aca3f01b6deb..cea5ecfa28cf 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/GConf-2.8.1.tar.bz2) = b1173cbe33404bcbcc15710ce2a28f67
-SIZE (gnome2/GConf-2.8.1.tar.bz2) = 1730812
+MD5 (gnome2/GConf-2.10.0.tar.bz2) = a7cd37be4e317195a6668a086fc72033
+SIZE (gnome2/GConf-2.10.0.tar.bz2) = 1734260
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index eb4b1a71a6a9..279911c02104 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -56,6 +56,7 @@ share/locale/el/LC_MESSAGES/GConf2.mo
share/locale/en_CA/LC_MESSAGES/GConf2.mo
share/locale/en_GB/LC_MESSAGES/GConf2.mo
share/locale/es/LC_MESSAGES/GConf2.mo
+share/locale/et/LC_MESSAGES/GConf2.mo
share/locale/eu/LC_MESSAGES/GConf2.mo
share/locale/fa/LC_MESSAGES/GConf2.mo
share/locale/fi/LC_MESSAGES/GConf2.mo
@@ -97,6 +98,7 @@ share/locale/ta/LC_MESSAGES/GConf2.mo
share/locale/tr/LC_MESSAGES/GConf2.mo
share/locale/uk/LC_MESSAGES/GConf2.mo
share/locale/vi/LC_MESSAGES/GConf2.mo
+share/locale/xh/LC_MESSAGES/GConf2.mo
share/locale/yi/LC_MESSAGES/GConf2.mo
share/locale/zh_CN/LC_MESSAGES/GConf2.mo
share/locale/zh_TW/LC_MESSAGES/GConf2.mo
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 1b2a139341b9..a6d5ad9a05f5 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -6,10 +6,11 @@
#
PORTNAME= glib
-PORTVERSION= 2.4.8
+PORTVERSION= 2.6.3
+PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.4,} \
- ftp://ftp.gtk.org/pub/gtk/v2.4/ \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.6,} \
+ ftp://ftp.gtk.org/pub/gtk/v2.6/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -38,4 +39,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 600012
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gthread_gthread-posix.c
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+ s|%%X11BASE%%|${X11BASE}|g' \
+ ${WRKSRC}/glib/gutils.c
+
+.include <bsd.port.post.mk>
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index da94272ac8f6..0d5183d695b5 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/glib-2.4.8.tar.bz2) = e160a5feecf46e0fbb36db09c356953c
-SIZE (gnome2/glib-2.4.8.tar.bz2) = 2152755
+MD5 (gnome2/glib-2.6.3.tar.bz2) = 8f69ad5387197114b356efc64ce88d77
+SIZE (gnome2/glib-2.6.3.tar.bz2) = 2300144
diff --git a/devel/glib20/files/extra-patch-gthread_gthread-posix.c b/devel/glib20/files/extra-patch-gthread_gthread-posix.c
new file mode 100644
index 000000000000..8796dd629960
--- /dev/null
+++ b/devel/glib20/files/extra-patch-gthread_gthread-posix.c
@@ -0,0 +1,32 @@
+--- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004
++++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005
+@@ -115,7 +115,11 @@
+ # define PRIORITY_NORMAL_VALUE priority_normal_value
+ #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */
+
++#define G_THREAD_STACK_SIZE32 (1*1024*1024)
++#define G_THREAD_STACK_SIZE64 (2*1024*1024)
++
+ static gulong g_thread_min_stack_size = 0;
++static gulong g_thread_default_stack_size = 0;
+
+ #define G_MUTEX_SIZE (sizeof (pthread_mutex_t))
+
+@@ -307,8 +312,16 @@
+ if (stack_size)
+ {
+ stack_size = MAX (g_thread_min_stack_size, stack_size);
+- posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size));
+ }
++ else
++ {
++ if (sizeof(void *) == 8)
++ g_thread_default_stack_size = G_THREAD_STACK_SIZE64;
++ else
++ g_thread_default_stack_size = G_THREAD_STACK_SIZE32;
++ stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size);
++ }
++ posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size));
+ #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */
+
+ #ifdef PTHREAD_SCOPE_SYSTEM
diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c
new file mode 100644
index 000000000000..d32b910ad8ca
--- /dev/null
+++ b/devel/glib20/files/patch-glib_gutils.c
@@ -0,0 +1,20 @@
+--- glib/gutils.c.orig Sat Sep 4 15:49:27 2004
++++ glib/gutils.c Sat Sep 4 15:55:24 2004
+@@ -1466,7 +1466,7 @@
+ data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
+
+ if (!data_dirs || !data_dirs[0])
+- data_dirs = "/usr/local/share/:/usr/share/";
++ data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
+ #endif
+ data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
+
+@@ -1509,7 +1509,7 @@
+ conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
+
+ if (!conf_dirs || !conf_dirs[0])
+- conf_dirs = "/etc/xdg";
++ conf_dirs = "%%X11BASE%%/etc/xdg:/usr/local/etc/xdg:/etc/xdg";
+ #endif
+ conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
+ }
diff --git a/devel/glib20/files/patch-gthread_gthread-posix.c b/devel/glib20/files/patch-gthread_gthread-posix.c
index bdf24590d4cc..47c5ab8f1591 100644
--- a/devel/glib20/files/patch-gthread_gthread-posix.c
+++ b/devel/glib20/files/patch-gthread_gthread-posix.c
@@ -1,15 +1,7 @@
---- gthread/gthread-posix.c.orig Tue Sep 7 17:57:53 2004
-+++ gthread/gthread-posix.c Tue Sep 7 17:58:30 2004
-@@ -116,6 +116,7 @@
- #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */
-
- static gulong g_thread_min_stack_size = 0;
-+static gulong g_thread_default_stack_size = 0x100000;
-
- #define G_MUTEX_SIZE (sizeof (pthread_mutex_t))
-
-@@ -125,7 +126,8 @@
- g_thread_impl_init()
+--- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004
++++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005
+@@ -125,7 +129,8 @@
+ g_thread_impl_init(void)
{
#ifdef _SC_THREAD_STACK_MIN
- g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), 0);
@@ -18,7 +10,7 @@
#endif /* _SC_THREAD_STACK_MIN */
#ifdef HAVE_PRIORITIES
# ifdef G_THREADS_IMPL_POSIX
-@@ -176,7 +178,7 @@
+@@ -176,7 +181,7 @@
result = pthread_mutex_trylock ((pthread_mutex_t *) mutex);
#ifdef G_THREADS_IMPL_POSIX
@@ -27,17 +19,3 @@
return FALSE;
#else /* G_THREADS_IMPL_DCE */
if (result == 0)
-@@ -307,8 +309,12 @@
- if (stack_size)
- {
- stack_size = MAX (g_thread_min_stack_size, stack_size);
-- posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size));
- }
-+ else
-+ {
-+ stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size);
-+ }
-+ posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size));
- #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */
-
- #ifdef PTHREAD_SCOPE_SYSTEM
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 5a7533881bfe..5bebbaa72a30 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -22,6 +22,7 @@ include/glib-2.0/glib/ghook.h
include/glib-2.0/glib/gi18n-lib.h
include/glib-2.0/glib/gi18n.h
include/glib-2.0/glib/giochannel.h
+include/glib-2.0/glib/gkeyfile.h
include/glib-2.0/glib/glist.h
include/glib-2.0/glib/gmacros.h
include/glib-2.0/glib/gmain.h
@@ -29,6 +30,7 @@ include/glib-2.0/glib/gmarkup.h
include/glib-2.0/glib/gmem.h
include/glib-2.0/glib/gmessages.h
include/glib-2.0/glib/gnode.h
+include/glib-2.0/glib/goption.h
include/glib-2.0/glib/gpattern.h
include/glib-2.0/glib/gprimes.h
include/glib-2.0/glib/gprintf.h
@@ -41,6 +43,7 @@ include/glib-2.0/glib/gscanner.h
include/glib-2.0/glib/gshell.h
include/glib-2.0/glib/gslist.h
include/glib-2.0/glib/gspawn.h
+include/glib-2.0/glib/gstdio.h
include/glib-2.0/glib/gstrfuncs.h
include/glib-2.0/glib/gstring.h
include/glib-2.0/glib/gthread.h
@@ -72,18 +75,19 @@ include/glib-2.0/gobject/gvaluecollector.h
include/glib-2.0/gobject/gvaluetypes.h
lib/libglib-2.0.a
lib/libglib-2.0.so
-lib/libglib-2.0.so.400
+lib/libglib-2.0.so.600
lib/libgmodule-2.0.a
lib/libgmodule-2.0.so
-lib/libgmodule-2.0.so.400
+lib/libgmodule-2.0.so.600
lib/libgobject-2.0.a
lib/libgobject-2.0.so
-lib/libgobject-2.0.so.400
+lib/libgobject-2.0.so.600
lib/libgthread-2.0.a
lib/libgthread-2.0.so
-lib/libgthread-2.0.so.400
+lib/libgthread-2.0.so.600
libdata/pkgconfig/glib-2.0.pc
libdata/pkgconfig/gmodule-2.0.pc
+libdata/pkgconfig/gmodule-no-export-2.0.pc
libdata/pkgconfig/gobject-2.0.pc
libdata/pkgconfig/gthread-2.0.pc
share/aclocal/glib-2.0.m4
@@ -148,10 +152,12 @@ share/locale/sr@Latn/LC_MESSAGES/glib20.mo
share/locale/sr@ije/LC_MESSAGES/glib20.mo
share/locale/sv/LC_MESSAGES/glib20.mo
share/locale/ta/LC_MESSAGES/glib20.mo
+share/locale/tl/LC_MESSAGES/glib20.mo
share/locale/tr/LC_MESSAGES/glib20.mo
share/locale/uk/LC_MESSAGES/glib20.mo
share/locale/vi/LC_MESSAGES/glib20.mo
share/locale/wa/LC_MESSAGES/glib20.mo
+share/locale/xh/LC_MESSAGES/glib20.mo
share/locale/yi/LC_MESSAGES/glib20.mo
share/locale/zh_CN/LC_MESSAGES/glib20.mo
share/locale/zh_TW/LC_MESSAGES/glib20.mo
@@ -159,6 +165,10 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@unexec rmdir %D/share/locale/ne 2> /dev/null || true
@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true
@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true
+@unexec rmdir %D/share/locale/tl/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/tl 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh 2> /dev/null || true
@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true
@unexec rmdir %D/share/locale/yi 2> /dev/null || true
@dirrm share/glib-2.0/gettext/po
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index a562cf3b8fe9..d5535b85750e 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomevfs2
-PORTVERSION= 2.8.4
+PORTVERSION= 2.10.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-vfs/2.8
+MASTER_SITE_SUBDIR= sources/gnome-vfs/2.10
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \
+USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
libbonobo
USE_REINPLACE= yes
USE_LIBTOOL_VER=15
@@ -39,8 +39,6 @@ GCONF_SCHEMAS= desktop_default_applications.schemas \
desktop_gnome_url_handlers.schemas system_dns_sd.schemas \
system_http_proxy.schemas system_smb.schemas
-OPTIONS= KDE_MENUS "Integrated KDE menu picks" on
-
.include <bsd.port.pre.mk>
.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
@@ -52,13 +50,6 @@ WITH_CDPARANOIA= yes
WITH_SAMBA= yes
.endif
-.if !defined(WITHOUT_KDE_MENUS)
-EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in
-PLIST_SUB+= KDEMENUS=""
-.else
-PLIST_SUB+= KDEMENUS="@comment "
-.endif
-
.if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
WITH_CDPARANOIA= yes
.endif
@@ -98,22 +89,12 @@ LIB_DEPENDS+= howl:${PORTSDIR}/net/howl
.endif
post-patch:
- @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|\@datadir\@/gnome|\@datadir\@|g'
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
- ${WRKSRC}/libgnomevfs/Makefile.in \
- ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
+ ${WRKSRC}/libgnomevfs/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
s|%%X11BASE%%|${X11BASE}|g' \
${WRKSRC}/libgnomevfs/xdgmime.c \
- ${WRKSRC}/libgnomevfs/eggdirfuncs.c \
${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c
-.if !defined(WITHOUT_KDE_MENUS)
- @${SED} -e 's|/usr/local|${LOCALBASE}|g' \
- < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
-.endif
- @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \
- ${WRKSRC}/Makefile.in
@${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
@${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
@@ -127,9 +108,5 @@ pre-configure:
post-install:
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if !defined(WITHOUT_KDE_MENUS)
- @${MKDIR} ${PREFIX}/share/gnome/vfolders
- @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders
-.endif
.include <bsd.port.post.mk>
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 505711b7dcbe..3bb839cef2ec 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.8.4.tar.bz2) = 42d3505e9ef9c26a7aae4e511b9b4c34
-SIZE (gnome2/gnome-vfs-2.8.4.tar.bz2) = 1892413
+MD5 (gnome2/gnome-vfs-2.10.0.tar.bz2) = bb9df65d6a77414bbde9f1bc429c9d97
+SIZE (gnome2/gnome-vfs-2.10.0.tar.bz2) = 1901027
diff --git a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
deleted file mode 100644
index 120a8906411f..000000000000
--- a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
+++ /dev/null
@@ -1,285 +0,0 @@
---- modules/vfolder/applications-all-users.vfolder-info.in.orig Fri Oct 17 10:11:22 2003
-+++ modules/vfolder/applications-all-users.vfolder-info.in Thu Feb 12 15:15:40 2004
-@@ -19,7 +19,14 @@
- <MergeDir>/usr/share/gnome/apps/</MergeDir>
-
- <!-- Merge dirs optional -->
-- <MergeDir>/etc/X11/applnk/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Toys/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Internet/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Office/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Applications/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Development/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Games/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir>
-
- <!-- Root folder -->
- <Folder>
-@@ -34,10 +41,12 @@
- <Query>
- <And>
- <Keyword>Core</Keyword>
-- <!-- FIXME: Seth, why would this be wanted? -->
-- <!--<Not>
-- <Keyword>Merged</Keyword>
-- </Not>-->
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- </And>
- </Query>
-
-@@ -47,6 +56,12 @@
- <Desktop>Accessories.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>Utility</Keyword>
- <Not>
-@@ -63,6 +78,12 @@
- <Desktop>Accessibility.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>Accessibility</Keyword>
- <Not>
-@@ -80,6 +101,12 @@
- <OnlyUnallocated/>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Not>
- <Keyword>Settings</Keyword>
-@@ -101,6 +128,12 @@
- <Desktop>Development.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>Development</Keyword>
- </And>
-@@ -114,6 +147,12 @@
- <Desktop>Games.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>Game</Keyword>
- </And>
-@@ -127,6 +166,12 @@
- <Desktop>Graphics.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>Graphics</Keyword>
- </And>
-@@ -140,6 +185,12 @@
- <Desktop>Internet.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>Network</Keyword>
- </And>
-@@ -153,6 +204,12 @@
- <Desktop>Multimedia.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>AudioVideo</Keyword>
- </And>
-@@ -170,6 +227,12 @@
- <Desktop>Office.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Or>
- <Keyword>Office</Keyword>
-@@ -195,6 +258,12 @@
- <Desktop>System.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Not>
- <Keyword>Settings</Keyword>
-@@ -204,6 +273,118 @@
- </Query>
- <DontShowIfEmpty/>
- </Folder>
--
-+
-+ <!-- KDE -->
-+ <Folder>
-+ <Name>KDE</Name>
-+ <Desktop>KDE.directory</Desktop>
-+
-+ <!-- KAccessories -->
-+ <Folder>
-+ <Name>Accessories</Name>
-+ <Desktop>Accessories.directory</Desktop>
-+ <Query>
-+ <And>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ <Keyword>Utility</Keyword>
-+ </And>
-+ </Query>
-+ <DontShowIfEmpty/>
-+ </Folder>
-+
-+ <!-- KDevelopment Tools -->
-+ <Folder>
-+ <Name>Programming</Name>
-+ <Desktop>Development.directory</Desktop>
-+ <Query>
-+ <And>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ <Keyword>Development</Keyword>
-+ </And>
-+ </Query>
-+ <DontShowIfEmpty/>
-+ </Folder>
-+
-+ <!-- KGraphics -->
-+ <Folder>
-+ <Name>Graphics</Name>
-+ <Desktop>Graphics.directory</Desktop>
-+ <Query>
-+ <And>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ <Keyword>Graphics</Keyword>
-+ </And>
-+ </Query>
-+ <DontShowIfEmpty/>
-+ </Folder>
-+
-+ <!-- KInternet -->
-+ <Folder>
-+ <Name>Internet</Name>
-+ <Desktop>Internet.directory</Desktop>
-+ <Query>
-+ <And>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ <Keyword>Network</Keyword>
-+ </And>
-+ </Query>
-+
-+ <Include>/usr/local/share/applnk/konqueror.desktop</Include>
-+
-+ <DontShowIfEmpty/>
-+ </Folder>
-+
-+ <!-- KMultimedia -->
-+ <Folder>
-+ <Name>Multimedia</Name>
-+ <Desktop>Multimedia.directory</Desktop>
-+ <Query>
-+ <And>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ <Keyword>AudioVideo</Keyword>
-+ </And>
-+ </Query>
-+ <DontShowIfEmpty/>
-+ </Folder>
-+
-+ <!-- KOffice -->
-+ <Folder>
-+ <Name>Office</Name>
-+ <Desktop>Office.directory</Desktop>
-+ <Query>
-+ <And>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ <Or>
-+ <Keyword>Office</Keyword>
-+ <Keyword>Spreadsheet</Keyword>
-+ <Keyword>WordProcessor</Keyword>
-+ <Keyword>Calendar</Keyword>
-+ <Keyword>ProjectManagement</Keyword>
-+ </Or>
-+ </And>
-+ </Query>
-+ <DontShowIfEmpty/>
-+ </Folder>
-+ <DontShowIfEmpty/>
-+ </Folder> <!-- KDE -->
-+
- </Folder>
- </VFolderInfo>
diff --git a/devel/gnome-vfs/files/patch-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in
new file mode 100644
index 000000000000..8c0d2a13160c
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-Makefile.in
@@ -0,0 +1,10 @@
+--- Makefile.in.orig Tue Nov 30 02:05:26 2004
++++ Makefile.in Tue Nov 30 02:05:34 2004
+@@ -230,7 +230,6 @@
+ devel-docs \
+ doc \
+ programs \
+- test \
+ monikers \
+ po
+
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c
deleted file mode 100644
index 82e0e5f61891..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/eggdirfuncs.c.orig Sat Jul 24 03:08:10 2004
-+++ libgnomevfs/eggdirfuncs.c Sat Jul 24 03:08:50 2004
-@@ -106,7 +106,7 @@
- data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
-
- if (!data_dirs || !data_dirs[0])
-- data_dirs = "/usr/local/share/:/usr/share/";
-+ data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/";
-
- data_dir_vector = g_strsplit (data_dirs, ":", 0);
-
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
deleted file mode 100644
index 5d37cc768ddb..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Sun Sep 5 02:34:30 2004
-+++ libgnomevfs/gnome-vfs-unix-mounts.c Sun Sep 5 02:35:08 2004
-@@ -43,6 +43,7 @@
- #include <errno.h>
- #include <string.h>
- #include <signal.h>
-+#include <poll.h>
- #include <libgnomevfs/gnome-vfs.h>
-
- #include "gnome-vfs-unix-mounts.h"
diff --git a/devel/gnome-vfs/files/patch-modules_smb-method.c b/devel/gnome-vfs/files/patch-modules_smb-method.c
new file mode 100644
index 000000000000..9c7cb9232cab
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_smb-method.c
@@ -0,0 +1,11 @@
+--- modules/smb-method.c.orig Tue Jan 11 18:24:53 2005
++++ modules/smb-method.c Tue Jan 11 18:25:03 2005
+@@ -1345,7 +1345,7 @@
+ GnomeVFSContext *context)
+ {
+ FileHandle *handle = (FileHandle *)method_handle;
+- GnomeVFSResult res = GNOME_VFS_OK;;
++ GnomeVFSResult res = GNOME_VFS_OK;
+ SmbAuthContext actx;
+ ssize_t n = 0;
+
diff --git a/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c b/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c
deleted file mode 100644
index a07d0bc81b39..000000000000
--- a/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/vfolder/vfolder-info.c.orig Fri Nov 29 13:40:11 2002
-+++ modules/vfolder/vfolder-info.c Fri Nov 29 13:40:19 2002
-@@ -1721,7 +1721,7 @@
-
- for (i = 0; ppath[i] != NULL; i++) {
- dir = g_build_filename (ppath[i],
-- "/share/applications/",
-+ "/share/gnome/applications/",
- NULL);
- id = itemdir_new (info,
- dir,
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index c594e7a9483b..2540d81f57e7 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -3,18 +3,12 @@ bin/gnomevfs-copy
bin/gnomevfs-info
bin/gnomevfs-ls
bin/gnomevfs-mkdir
+bin/gnomevfs-mv
bin/gnomevfs-rm
%%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
etc/gnome-vfs-2.0/modules/default-modules.conf
%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf
etc/gnome-vfs-2.0/modules/ssl-modules.conf
-etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
-etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info
-etc/gnome-vfs-2.0/vfolders/network.vfolder-info
-etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info
-etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info
-etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info
-etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info
include/gnome-vfs-2.0/include/gnome-vfs-file-size.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
@@ -31,6 +25,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h
@@ -75,13 +70,12 @@ lib/gnome-vfs-2.0/modules/libnntp.so
lib/gnome-vfs-2.0/modules/libsftp.so
%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so
lib/gnome-vfs-2.0/modules/libtar.so
-lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
lib/gnome-vfs-2.0/modules/libvfs-pipe.so
lib/gnome-vfs-2.0/modules/libvfs-test.so
lib/gnome-vfs-2.0/modules/libvfs-translate.so
lib/libgnomevfs-2.a
lib/libgnomevfs-2.so
-lib/libgnomevfs-2.so.800
+lib/libgnomevfs-2.so.1000
libdata/bonobo/servers/GNOME_VFS_Daemon.server
libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
libdata/pkgconfig/gnome-vfs-2.0.pc
@@ -110,6 +104,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html
share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
@@ -143,9 +138,9 @@ share/doc/gnome-vfs-2.0/mime-registry.html
share/doc/gnome-vfs-2.0/modules.html
share/doc/gnome-vfs-2.0/networking.html
share/doc/gnome-vfs-2.0/right.png
+share/doc/gnome-vfs-2.0/style.css
share/doc/gnome-vfs-2.0/up.png
share/doc/gnome-vfs-2.0/volumes.html
-%%KDEMENUS%%share/gnome/vfolders/KDE.directory
share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -214,18 +209,18 @@ share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso 2> /dev/null || true
@dirrm share/doc/gnome-vfs-2.0
@dirrm include/gnome-vfs-module-2.0/libgnomevfs
@dirrm include/gnome-vfs-module-2.0
@dirrm include/gnome-vfs-2.0/libgnomevfs
@dirrm include/gnome-vfs-2.0/include
@dirrm include/gnome-vfs-2.0
-@dirrm etc/gnome-vfs-2.0/vfolders
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh 2> /dev/null || true
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 6986ce0c5971..36a002449cfa 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gnome-vfsmm
-PORTVERSION= 2.6.1
-PORTREVISION= 1
+PORTVERSION= 2.10.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -23,8 +22,8 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GCC= 3.4
USE_GMAKE= yes
-USE_GNOME= gnomehack lthack gnomevfs2
-USE_INC_LIBTOOL_VER=13
+USE_GNOME= gnomehack gnomevfs2
+USE_INC_LIBTOOL_VER=15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
@@ -34,4 +33,13 @@ post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
${WRKSRC}/Makefile.in
+patch-autotools:
+ @(cd ${PATCH_WRKSRC}; \
+ for file in ${LIBTOOLFILES}; do \
+ ${CP} $$file $$file.tmp; \
+ ${SED} -e "/^ltmain=/s^\$$ac_aux_dir/ltmain.sh^${LTMAIN}^g" \
+ $$file.tmp > $$file; \
+ ${RM} $$file.tmp; \
+ done);
+
.include <bsd.port.mk>
diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo
index 821085698be8..00edc798d38f 100644
--- a/devel/gnome-vfsmm/distinfo
+++ b/devel/gnome-vfsmm/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfsmm-2.6.1.tar.bz2) = a0f8006f7336b211f160224fddaf86e1
-SIZE (gnome2/gnome-vfsmm-2.6.1.tar.bz2) = 290073
+MD5 (gnome2/gnome-vfsmm-2.10.0.tar.bz2) = 0d5751f1c0074289c3e6a858357f9c4d
+SIZE (gnome2/gnome-vfsmm-2.10.0.tar.bz2) = 317394
diff --git a/devel/gnome-vfsmm/pkg-plist b/devel/gnome-vfsmm/pkg-plist
index 39b64f3674b2..4fee1a3e7c83 100644
--- a/devel/gnome-vfsmm/pkg-plist
+++ b/devel/gnome-vfsmm/pkg-plist
@@ -1,8 +1,10 @@
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm.h
+include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/address.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/application-registry.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async-handle.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/directory-handle.h
+include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/dns-sd.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/drive.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/enums.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/exception.h
@@ -15,6 +17,7 @@ include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/mime-handlers.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/mime-monitor.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/monitor-handle.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private.h
+include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/address_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/async-handle_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/drive_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/enums_p.h
@@ -22,10 +25,12 @@ include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/file-info_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-action_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-application_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-monitor_p.h
+include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/resolve-handle_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/transfer-progress_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/uri_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/volume-monitor_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/volume_p.h
+include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/resolve-handle.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer-progress.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/types.h
diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile
index c42039ec40a4..cc87b3cc7f94 100644
--- a/devel/gnome2-hacker-tools/Makefile
+++ b/devel/gnome2-hacker-tools/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnome2-hacker-tools
-PORTVERSION= 2.8.3
+PORTVERSION= 2.10.0
CATEGORIES= devel gnome
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index a562cf3b8fe9..d5535b85750e 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomevfs2
-PORTVERSION= 2.8.4
+PORTVERSION= 2.10.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-vfs/2.8
+MASTER_SITE_SUBDIR= sources/gnome-vfs/2.10
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \
+USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
libbonobo
USE_REINPLACE= yes
USE_LIBTOOL_VER=15
@@ -39,8 +39,6 @@ GCONF_SCHEMAS= desktop_default_applications.schemas \
desktop_gnome_url_handlers.schemas system_dns_sd.schemas \
system_http_proxy.schemas system_smb.schemas
-OPTIONS= KDE_MENUS "Integrated KDE menu picks" on
-
.include <bsd.port.pre.mk>
.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
@@ -52,13 +50,6 @@ WITH_CDPARANOIA= yes
WITH_SAMBA= yes
.endif
-.if !defined(WITHOUT_KDE_MENUS)
-EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in
-PLIST_SUB+= KDEMENUS=""
-.else
-PLIST_SUB+= KDEMENUS="@comment "
-.endif
-
.if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
WITH_CDPARANOIA= yes
.endif
@@ -98,22 +89,12 @@ LIB_DEPENDS+= howl:${PORTSDIR}/net/howl
.endif
post-patch:
- @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|\@datadir\@/gnome|\@datadir\@|g'
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
- ${WRKSRC}/libgnomevfs/Makefile.in \
- ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
+ ${WRKSRC}/libgnomevfs/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
s|%%X11BASE%%|${X11BASE}|g' \
${WRKSRC}/libgnomevfs/xdgmime.c \
- ${WRKSRC}/libgnomevfs/eggdirfuncs.c \
${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c
-.if !defined(WITHOUT_KDE_MENUS)
- @${SED} -e 's|/usr/local|${LOCALBASE}|g' \
- < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
-.endif
- @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \
- ${WRKSRC}/Makefile.in
@${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
@${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
@@ -127,9 +108,5 @@ pre-configure:
post-install:
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if !defined(WITHOUT_KDE_MENUS)
- @${MKDIR} ${PREFIX}/share/gnome/vfolders
- @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders
-.endif
.include <bsd.port.post.mk>
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 505711b7dcbe..3bb839cef2ec 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.8.4.tar.bz2) = 42d3505e9ef9c26a7aae4e511b9b4c34
-SIZE (gnome2/gnome-vfs-2.8.4.tar.bz2) = 1892413
+MD5 (gnome2/gnome-vfs-2.10.0.tar.bz2) = bb9df65d6a77414bbde9f1bc429c9d97
+SIZE (gnome2/gnome-vfs-2.10.0.tar.bz2) = 1901027
diff --git a/devel/gnomevfs2/files/KDE.directory b/devel/gnomevfs2/files/KDE.directory
deleted file mode 100644
index 032126bb99db..000000000000
--- a/devel/gnomevfs2/files/KDE.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Name=KDE
-Comment=Some comment about KDE menu
-Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png
-Type=Directory
diff --git a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in
deleted file mode 100644
index 120a8906411f..000000000000
--- a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in
+++ /dev/null
@@ -1,285 +0,0 @@
---- modules/vfolder/applications-all-users.vfolder-info.in.orig Fri Oct 17 10:11:22 2003
-+++ modules/vfolder/applications-all-users.vfolder-info.in Thu Feb 12 15:15:40 2004
-@@ -19,7 +19,14 @@
- <MergeDir>/usr/share/gnome/apps/</MergeDir>
-
- <!-- Merge dirs optional -->
-- <MergeDir>/etc/X11/applnk/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Toys/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Internet/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Office/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Applications/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Development/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Games/</MergeDir>
-+ <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir>
-
- <!-- Root folder -->
- <Folder>
-@@ -34,10 +41,12 @@
- <Query>
- <And>
- <Keyword>Core</Keyword>
-- <!-- FIXME: Seth, why would this be wanted? -->
-- <!--<Not>
-- <Keyword>Merged</Keyword>
-- </Not>-->
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- </And>
- </Query>
-
-@@ -47,6 +56,12 @@
- <Desktop>Accessories.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>Utility</Keyword>
- <Not>
-@@ -63,6 +78,12 @@
- <Desktop>Accessibility.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>Accessibility</Keyword>
- <Not>
-@@ -80,6 +101,12 @@
- <OnlyUnallocated/>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Not>
- <Keyword>Settings</Keyword>
-@@ -101,6 +128,12 @@
- <Desktop>Development.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>Development</Keyword>
- </And>
-@@ -114,6 +147,12 @@
- <Desktop>Games.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>Game</Keyword>
- </And>
-@@ -127,6 +166,12 @@
- <Desktop>Graphics.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>Graphics</Keyword>
- </And>
-@@ -140,6 +185,12 @@
- <Desktop>Internet.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>Network</Keyword>
- </And>
-@@ -153,6 +204,12 @@
- <Desktop>Multimedia.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Keyword>AudioVideo</Keyword>
- </And>
-@@ -170,6 +227,12 @@
- <Desktop>Office.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Or>
- <Keyword>Office</Keyword>
-@@ -195,6 +258,12 @@
- <Desktop>System.directory</Desktop>
- <Query>
- <And>
-+ <Not>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ </Not>
- <Keyword>Application</Keyword>
- <Not>
- <Keyword>Settings</Keyword>
-@@ -204,6 +273,118 @@
- </Query>
- <DontShowIfEmpty/>
- </Folder>
--
-+
-+ <!-- KDE -->
-+ <Folder>
-+ <Name>KDE</Name>
-+ <Desktop>KDE.directory</Desktop>
-+
-+ <!-- KAccessories -->
-+ <Folder>
-+ <Name>Accessories</Name>
-+ <Desktop>Accessories.directory</Desktop>
-+ <Query>
-+ <And>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ <Keyword>Utility</Keyword>
-+ </And>
-+ </Query>
-+ <DontShowIfEmpty/>
-+ </Folder>
-+
-+ <!-- KDevelopment Tools -->
-+ <Folder>
-+ <Name>Programming</Name>
-+ <Desktop>Development.directory</Desktop>
-+ <Query>
-+ <And>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ <Keyword>Development</Keyword>
-+ </And>
-+ </Query>
-+ <DontShowIfEmpty/>
-+ </Folder>
-+
-+ <!-- KGraphics -->
-+ <Folder>
-+ <Name>Graphics</Name>
-+ <Desktop>Graphics.directory</Desktop>
-+ <Query>
-+ <And>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ <Keyword>Graphics</Keyword>
-+ </And>
-+ </Query>
-+ <DontShowIfEmpty/>
-+ </Folder>
-+
-+ <!-- KInternet -->
-+ <Folder>
-+ <Name>Internet</Name>
-+ <Desktop>Internet.directory</Desktop>
-+ <Query>
-+ <And>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ <Keyword>Network</Keyword>
-+ </And>
-+ </Query>
-+
-+ <Include>/usr/local/share/applnk/konqueror.desktop</Include>
-+
-+ <DontShowIfEmpty/>
-+ </Folder>
-+
-+ <!-- KMultimedia -->
-+ <Folder>
-+ <Name>Multimedia</Name>
-+ <Desktop>Multimedia.directory</Desktop>
-+ <Query>
-+ <And>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ <Keyword>AudioVideo</Keyword>
-+ </And>
-+ </Query>
-+ <DontShowIfEmpty/>
-+ </Folder>
-+
-+ <!-- KOffice -->
-+ <Folder>
-+ <Name>Office</Name>
-+ <Desktop>Office.directory</Desktop>
-+ <Query>
-+ <And>
-+ <Or>
-+ <Keyword>Qt</Keyword>
-+ <Keyword>KDE</Keyword>
-+ </Or>
-+ <Or>
-+ <Keyword>Office</Keyword>
-+ <Keyword>Spreadsheet</Keyword>
-+ <Keyword>WordProcessor</Keyword>
-+ <Keyword>Calendar</Keyword>
-+ <Keyword>ProjectManagement</Keyword>
-+ </Or>
-+ </And>
-+ </Query>
-+ <DontShowIfEmpty/>
-+ </Folder>
-+ <DontShowIfEmpty/>
-+ </Folder> <!-- KDE -->
-+
- </Folder>
- </VFolderInfo>
diff --git a/devel/gnomevfs2/files/patch-Makefile.in b/devel/gnomevfs2/files/patch-Makefile.in
new file mode 100644
index 000000000000..8c0d2a13160c
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-Makefile.in
@@ -0,0 +1,10 @@
+--- Makefile.in.orig Tue Nov 30 02:05:26 2004
++++ Makefile.in Tue Nov 30 02:05:34 2004
+@@ -230,7 +230,6 @@
+ devel-docs \
+ doc \
+ programs \
+- test \
+ monikers \
+ po
+
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c
deleted file mode 100644
index 82e0e5f61891..000000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/eggdirfuncs.c.orig Sat Jul 24 03:08:10 2004
-+++ libgnomevfs/eggdirfuncs.c Sat Jul 24 03:08:50 2004
-@@ -106,7 +106,7 @@
- data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
-
- if (!data_dirs || !data_dirs[0])
-- data_dirs = "/usr/local/share/:/usr/share/";
-+ data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/";
-
- data_dir_vector = g_strsplit (data_dirs, ":", 0);
-
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
deleted file mode 100644
index 5d37cc768ddb..000000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Sun Sep 5 02:34:30 2004
-+++ libgnomevfs/gnome-vfs-unix-mounts.c Sun Sep 5 02:35:08 2004
-@@ -43,6 +43,7 @@
- #include <errno.h>
- #include <string.h>
- #include <signal.h>
-+#include <poll.h>
- #include <libgnomevfs/gnome-vfs.h>
-
- #include "gnome-vfs-unix-mounts.h"
diff --git a/devel/gnomevfs2/files/patch-modules_smb-method.c b/devel/gnomevfs2/files/patch-modules_smb-method.c
new file mode 100644
index 000000000000..9c7cb9232cab
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-modules_smb-method.c
@@ -0,0 +1,11 @@
+--- modules/smb-method.c.orig Tue Jan 11 18:24:53 2005
++++ modules/smb-method.c Tue Jan 11 18:25:03 2005
+@@ -1345,7 +1345,7 @@
+ GnomeVFSContext *context)
+ {
+ FileHandle *handle = (FileHandle *)method_handle;
+- GnomeVFSResult res = GNOME_VFS_OK;;
++ GnomeVFSResult res = GNOME_VFS_OK;
+ SmbAuthContext actx;
+ ssize_t n = 0;
+
diff --git a/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c b/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c
deleted file mode 100644
index a07d0bc81b39..000000000000
--- a/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/vfolder/vfolder-info.c.orig Fri Nov 29 13:40:11 2002
-+++ modules/vfolder/vfolder-info.c Fri Nov 29 13:40:19 2002
-@@ -1721,7 +1721,7 @@
-
- for (i = 0; ppath[i] != NULL; i++) {
- dir = g_build_filename (ppath[i],
-- "/share/applications/",
-+ "/share/gnome/applications/",
- NULL);
- id = itemdir_new (info,
- dir,
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index c594e7a9483b..2540d81f57e7 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -3,18 +3,12 @@ bin/gnomevfs-copy
bin/gnomevfs-info
bin/gnomevfs-ls
bin/gnomevfs-mkdir
+bin/gnomevfs-mv
bin/gnomevfs-rm
%%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
etc/gnome-vfs-2.0/modules/default-modules.conf
%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf
etc/gnome-vfs-2.0/modules/ssl-modules.conf
-etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
-etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info
-etc/gnome-vfs-2.0/vfolders/network.vfolder-info
-etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info
-etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info
-etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info
-etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info
include/gnome-vfs-2.0/include/gnome-vfs-file-size.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
@@ -31,6 +25,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h
@@ -75,13 +70,12 @@ lib/gnome-vfs-2.0/modules/libnntp.so
lib/gnome-vfs-2.0/modules/libsftp.so
%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so
lib/gnome-vfs-2.0/modules/libtar.so
-lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
lib/gnome-vfs-2.0/modules/libvfs-pipe.so
lib/gnome-vfs-2.0/modules/libvfs-test.so
lib/gnome-vfs-2.0/modules/libvfs-translate.so
lib/libgnomevfs-2.a
lib/libgnomevfs-2.so
-lib/libgnomevfs-2.so.800
+lib/libgnomevfs-2.so.1000
libdata/bonobo/servers/GNOME_VFS_Daemon.server
libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
libdata/pkgconfig/gnome-vfs-2.0.pc
@@ -110,6 +104,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html
share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
@@ -143,9 +138,9 @@ share/doc/gnome-vfs-2.0/mime-registry.html
share/doc/gnome-vfs-2.0/modules.html
share/doc/gnome-vfs-2.0/networking.html
share/doc/gnome-vfs-2.0/right.png
+share/doc/gnome-vfs-2.0/style.css
share/doc/gnome-vfs-2.0/up.png
share/doc/gnome-vfs-2.0/volumes.html
-%%KDEMENUS%%share/gnome/vfolders/KDE.directory
share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -214,18 +209,18 @@ share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso 2> /dev/null || true
@dirrm share/doc/gnome-vfs-2.0
@dirrm include/gnome-vfs-module-2.0/libgnomevfs
@dirrm include/gnome-vfs-module-2.0
@dirrm include/gnome-vfs-2.0/libgnomevfs
@dirrm include/gnome-vfs-2.0/include
@dirrm include/gnome-vfs-2.0
-@dirrm etc/gnome-vfs-2.0/vfolders
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh 2> /dev/null || true
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 9bb4bd71232b..1189bceee5ea 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -6,21 +6,25 @@
#
PORTNAME= libglade2
-PORTVERSION= 2.4.2
+PORTVERSION= 2.5.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME glade library
-RUN_DEPENDS= xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
+BUILD_DEPENDS= ${PYEXPAT}
+RUN_DEPENDS= ${PYEXPAT} \
+ xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_REINPLACE= yes
USE_GMAKE= yes
+USE_PYTHON= yes
USE_LIBTOOL_VER=15
USE_GNOME= gnomehack libxml2 gtk20
INSTALLS_SHLIB= yes
@@ -33,19 +37,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
PLIST_SUB= XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \
CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports"
-.if !defined(WITHOUT_PYTHON)
-BUILD_DEPENDS+= ${PYEXPAT}
-RUN_DEPENDS+= ${PYEXPAT}
-
-USE_PYTHON= yes
-PLIST_SUB+= PYTHON=""
-.else
-USE_REINPLACE= yes
-PLIST_SUB+= PYTHON="@comment "
-
-post-patch:
- @${REINPLACE_CMD} -E 's/in (python.*)+ none/in none/' \
- ${WRKSRC}/configure
-.endif
-
.include <bsd.port.mk>
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index e9de85991c82..5282553c1b70 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1,2 +1,4 @@
-MD5 (gnome2/libglade-2.4.2.tar.bz2) = 83d08f9ab485a10454bd5171d2d53fb0
-SIZE (gnome2/libglade-2.4.2.tar.bz2) = 317692
+MD5 (gnome2/libglade-2.5.1.tar.bz2) = e4734a59f1f2308d7714dc0ebf8163f1
+SIZE (gnome2/libglade-2.5.1.tar.bz2) = 317524
+MD5 (gnome2/tacos) = e4734a59f1f2308d7714dc0ebf8163f2
+SIZE (gnome2/tacos) = 317525
diff --git a/devel/libglade2/files/patch-ab b/devel/libglade2/files/patch-ab
index 48724e9e9200..1ef7b7ed18bc 100644
--- a/devel/libglade2/files/patch-ab
+++ b/devel/libglade2/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig Mon Nov 29 15:14:24 2004
-+++ Makefile.in Mon Nov 29 15:14:24 2004
+--- Makefile.in.orig Mon May 17 12:30:40 2004
++++ Makefile.in Mon May 17 12:31:44 2004
@@ -22,7 +22,7 @@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -9,7 +9,7 @@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-@@ -250,7 +250,7 @@
+@@ -229,7 +229,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist
index 588f41a86546..cba156fe6624 100644
--- a/devel/libglade2/pkg-plist
+++ b/devel/libglade2/pkg-plist
@@ -1,4 +1,4 @@
-%%PYTHON%%bin/libglade-convert
+bin/libglade-convert
include/libglade-2.0/glade/glade-build.h
include/libglade-2.0/glade/glade-init.h
include/libglade-2.0/glade/glade-parser.h
diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile
index 0634e22a7f49..172b752b9c27 100644
--- a/devel/libgsf-gnome/Makefile
+++ b/devel/libgsf-gnome/Makefile
@@ -7,7 +7,6 @@
CATEGORIES= devel gnome
PKGNAMESUFFIX= -gnome
-PORTREVISION= 1
MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNOME wrapper for libgsf
diff --git a/devel/libgsf-gnome/pkg-plist b/devel/libgsf-gnome/pkg-plist
index 7951e9d386d1..fdd0f93c589f 100644
--- a/devel/libgsf-gnome/pkg-plist
+++ b/devel/libgsf-gnome/pkg-plist
@@ -5,6 +5,6 @@ include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h
include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h
lib/libgsf-gnome-1.a
lib/libgsf-gnome-1.so
-lib/libgsf-gnome-1.so.11
+lib/libgsf-gnome-1.so.12
libdata/pkgconfig/libgsf-gnome-1.pc
@dirrm include/libgsf-1/gsf-gnome
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 9e1572e154d1..e7a43b557eb1 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libgsf
-PORTVERSION= 1.10.1
+PORTVERSION= 1.11.1
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -24,7 +24,7 @@ USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_GNOME?= gnomehack glib20 libxml2
USE_LIBTOOL_VER=15
-CONFIGURE_ARGS?= --with-html-dir=${PREFIX}/share/doc \
+CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc --without-gnome --with-bz2
CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 8d2a941e63ad..01cc1c40a6dd 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgsf-1.10.1.tar.bz2) = b7b1c1e9adf3fd39a4df6f6891bf3bca
-SIZE (gnome2/libgsf-1.10.1.tar.bz2) = 399510
+MD5 (gnome2/libgsf-1.11.1.tar.bz2) = b6d867f46e20dca5c6bf2cf3bfc38cfc
+SIZE (gnome2/libgsf-1.11.1.tar.bz2) = 413711
diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist
index 0e9f5a3ec9b5..9f6dc384532b 100644
--- a/devel/libgsf/pkg-plist
+++ b/devel/libgsf/pkg-plist
@@ -1,5 +1,6 @@
include/libgsf-1/gsf-win32/gsf-input-win32.h
include/libgsf-1/gsf-win32/gsf-output-win32.h
+include/libgsf-1/gsf/gsf-doc-meta-data.h
include/libgsf-1/gsf/gsf-impl-utils.h
include/libgsf-1/gsf/gsf-infile-impl.h
include/libgsf-1/gsf/gsf-infile-msole.h
@@ -12,10 +13,12 @@ include/libgsf-1/gsf/gsf-input-gzip.h
include/libgsf-1/gsf/gsf-input-impl.h
include/libgsf-1/gsf/gsf-input-iochannel.h
include/libgsf-1/gsf/gsf-input-memory.h
+include/libgsf-1/gsf/gsf-input-proxy.h
include/libgsf-1/gsf/gsf-input-stdio.h
include/libgsf-1/gsf/gsf-input-textline.h
include/libgsf-1/gsf/gsf-input.h
include/libgsf-1/gsf/gsf-libxml.h
+include/libgsf-1/gsf/gsf-meta-names.h
include/libgsf-1/gsf/gsf-msole-utils.h
include/libgsf-1/gsf/gsf-outfile-impl.h
include/libgsf-1/gsf/gsf-outfile-msole.h
@@ -35,7 +38,7 @@ include/libgsf-1/gsf/gsf-utils.h
include/libgsf-1/gsf/gsf.h
lib/libgsf-1.a
lib/libgsf-1.so
-lib/libgsf-1.so.11
+lib/libgsf-1.so.12
libdata/pkgconfig/libgsf-1.pc
share/doc/gsf/api.html
share/doc/gsf/gsf-Bononbo.html
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 862a5ca17378..5a15a4612020 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libgtop2
-PORTVERSION= 2.8.3
+PORTVERSION= 2.10.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10
DISTNAME= libgtop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 05e797b96de7..f6a71904beaf 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgtop-2.8.3.tar.bz2) = 4cacb87938bf702b17a721b2ac068252
-SIZE (gnome2/libgtop-2.8.3.tar.bz2) = 1047504
+MD5 (gnome2/libgtop-2.10.0.tar.bz2) = 9a52cd5332a13e57ca606d8a85a67c97
+SIZE (gnome2/libgtop-2.10.0.tar.bz2) = 746223
diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah
deleted file mode 100644
index e0d7484420ec..000000000000
--- a/devel/libgtop2/files/patch-ah
+++ /dev/null
@@ -1,63 +0,0 @@
---- sysdeps/freebsd/procmap.c.orig Sat Sep 25 07:49:06 2004
-+++ sysdeps/freebsd/procmap.c Fri Nov 19 11:26:15 2004
-@@ -47,7 +47,13 @@
- #endif
- #endif
-
-+#ifdef __FreeBSD__
-+#define _KVM_VNODE
-+#endif
- #include <sys/vnode.h>
-+#ifdef __FreeBSD__
-+#undef _KVM_VNODE
-+#endif
- #include <sys/mount.h>
- #include <ufs/ufs/quota.h>
- #include <ufs/ufs/inode.h>
-@@ -104,7 +110,7 @@
- glibtop_map_entry *maps;
- #if defined __FreeBSD__
- struct vnode vnode;
--#if __FreeBSD_version >= 500039
-+#if __FreeBSD_version < 500039
- struct inode inode;
- #endif
- #endif
-@@ -122,8 +128,10 @@
-
- /* Get the process data */
- pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
-- if ((pinfo == NULL) || (count < 1))
-+ if ((pinfo == NULL) || (count < 1)) {
- glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
-+ return NULL;
-+ }
-
- /* Now we get the memory maps. */
-
-@@ -264,8 +272,10 @@
- #if defined(__FreeBSD__) && (__FreeBSD_version >= 500039)
- switch (vnode.v_type) {
- case VREG:
-+#if __FreeBSD_version < 600006
- maps [i-1].inode = vnode.v_cachedid;
- maps [i-1].device = vnode.v_cachedfs;
-+#endif
- default:
- continue;
- }
-@@ -278,13 +288,9 @@
- &inode, sizeof (inode)) != sizeof (inode))
- glibtop_error_io_r (server, "kvm_read (inode)");
-
-- if (kvm_read (server->machine.kd,
-- (unsigned long) vnode.v_mount,
-- &mount, sizeof (mount)) != sizeof (mount))
-- glibtop_error_io_r (server, "kvm_read (mount)");
--#endif
- maps [i-1].inode = inode.i_number;
- maps [i-1].device = inode.i_dev;
-+#endif
- #endif
- } while (entry.next != first);
-
diff --git a/devel/libgtop2/files/patch-lib::lib.pl b/devel/libgtop2/files/patch-lib::lib.pl
deleted file mode 100644
index 6e08ba030855..000000000000
--- a/devel/libgtop2/files/patch-lib::lib.pl
+++ /dev/null
@@ -1,62 +0,0 @@
---- lib/lib.pl.orig Mon Sep 1 20:17:45 2003
-+++ lib/lib.pl Wed Sep 3 11:53:12 2003
-@@ -116,6 +116,8 @@
- $param_decl = '';
- $send_size = '';
- $send_ptr = '';
-+ $send_buf_decl = '';
-+ $send_buf = '';
- $nr_params = (@params = split(/:/, $param_def, 9999));
- for ($param = 1; $param <= $nr_params; $param++) {
- $list = $params[$param];
-@@ -135,28 +137,37 @@
-
- $fields[$field];
- $call_param = $call_param . ', ' . $fields[$field];
-- if ($send_ptr eq '') {
-- $send_ptr = "\n\tconst void *send_ptr = &" .
--
-- $fields[$field] . ';';
-- }
-- if ($send_size eq '') {
-- $send_size = "\n\tconst size_t send_size =\n\t\t";
-+ if ($send_buf eq '') {
-+ $send_size = "\n\tconst size_t send_size = ";
-+ $send_ptr = "\n\tconst void *send_ptr = &";
-+ if ($nr_params == 1 && $count == 1) {
-+ $send_size = $send_size . 'sizeof (' . $fields[$field] . ');';
-+ $send_ptr = $send_ptr . $fields[$field] . ';';
-+ last;
-+ }
-+ $send_size = $send_size . 'sizeof (send_buf);';
-+ $send_ptr = $send_ptr . 'send_buf;';
- }
- else {
-- $send_size = $send_size . ' + ';
-+ $send_buf_decl = $send_buf_decl . ' ';
-+ $send_buf = $send_buf . ', ';
- }
-- $send_size = $send_size . 'sizeof (' . $fields[$field] . ')';
-+ $send_buf_decl = $send_buf_decl . '' . $convert{$type} . ' ' .
-+
-+ $fields[$field] . ';';
-+ $send_buf = $send_buf . '' . $fields[$field];
- }
- }
-- if ($send_size ne '') {
-- $send_size = $send_size . ';';
-- }
-- else {
-+ if ($send_size eq '') {
- $send_size = "\n\tconst size_t send_size = 0;";
- }
- if ($send_ptr eq '') {
- $send_ptr = "\n\tconst void *send_ptr = NULL;";
-+ }
-+ if ($send_buf ne '') {
-+ $send_ptr = "\n\tconst struct { " . $send_buf_decl . " } send_buf =\n" .
-+ "\t\t{ " . $send_buf . ' };' .
-+ $send_ptr;
- }
- }
-
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
deleted file mode 100644
index 0713da61925e..000000000000
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- sysdeps/freebsd/procmem.c.orig Mon Jul 19 02:07:03 2004
-+++ sysdeps/freebsd/procmem.c Tue Jul 20 22:03:29 2004
-@@ -125,7 +125,7 @@
- #else
- struct vm_object object;
- #endif
-- struct plimit plimit;
-+ struct rlimit rlimit;
- int count;
-
- glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0);
-@@ -160,15 +160,12 @@
-
- #define PROC_VMSPACE kp_proc.p_vmspace
-
-- if (kvm_read (server->machine.kd,
-- (unsigned long) pinfo [0].PROC_VMSPACE,
-- (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) {
-- glibtop_warn_io_r (server, "kvm_read (plimit)");
-+ if (getrlimit (RLIMIT_RSS, &rlimit) < 0) {
-+ glibtop_warn_io_r (server, "getrlimit");
- return;
- }
-
-- buf->rss_rlim = (guint64)
-- (plimit.pl_rlimit [RLIMIT_RSS].rlim_cur);
-+ buf->rss_rlim = (u_int64_t) (rlimit.rlim_cur);
-
- vms = &pinfo [0].kp_eproc.e_vm;
-
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c b/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
deleted file mode 100644
index 37b5b56df49a..000000000000
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- sysdeps/freebsd/proctime.c.orig Wed Mar 10 21:23:52 2004
-+++ sysdeps/freebsd/proctime.c Thu Mar 11 15:47:35 2004
-@@ -59,6 +59,7 @@
-
- #ifndef __FreeBSD__
-
-+#ifndef __FreeBSD__
- static void
- calcru(p, up, sp, ip)
- struct proc *p;
-@@ -81,19 +82,10 @@
- tot = 1;
- }
-
--#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003)
--
-- /* This was changed from a `struct timeval' into a `guint64'
-- * on FreeBSD 3.0 and renamed p_rtime -> p_runtime.
-- */
--
-- totusec = (u_quad_t) p->p_runtime;
--#else
- sec = p->p_rtime.tv_sec;
- usec = p->p_rtime.tv_usec;
-
- totusec = (quad_t)sec * 1000000 + usec;
--#endif
-
- if (totusec < 0) {
- /* XXX no %qd in kernel. Truncate. */
-@@ -116,6 +108,7 @@
- ip->tv_usec = it % 1000000;
- }
- }
-+#endif
-
- #endif /* !__FreeBSD__ */
-
-@@ -133,9 +126,6 @@
- #endif
- struct pstats pstats;
- int count;
--
-- char filename [BUFSIZ];
-- struct stat statb;
-
- glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0);
-
diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
deleted file mode 100644
index de564dcfd5f6..000000000000
--- a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- sysdeps/common/fsusage.c.orig Sun Oct 17 00:51:26 2004
-+++ sysdeps/common/fsusage.c Sun Oct 17 00:52:07 2004
-@@ -253,8 +253,9 @@
- if (statvfs (path, &fsd) < 0)
- return;
-
--#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))
-- /* Solaris but not SunOS */
-+#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \
-+ || defined(__FreeBSD__)
-+ /* Solaris but not SunOS and FreeBSD */
- buf->block_size = fsd.f_frsize;
- #else
- /* else, including Linux */
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
deleted file mode 100644
index 16bcbb055472..000000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- sysdeps/freebsd/Makefile.in.orig Sun Feb 15 16:13:22 2004
-+++ sysdeps/freebsd/Makefile.in Sun Feb 15 16:16:05 2004
-@@ -138,7 +138,7 @@
-
- noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
-
--libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c
-+libgtop_sysdeps_2_0_la_SOURCES = nosuid.c
-
- libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
-
-@@ -172,7 +172,7 @@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- libgtop_sysdeps_2_0_la_LIBADD =
--libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo
-+libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo
- libgtop_sysdeps_suid_2_0_la_LIBADD =
- libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo siglist.lo \
- cpu.lo mem.lo swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo \
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index 8bc83937eb9c..1f1a0363cadd 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -4,7 +4,6 @@ include/libgtop-2.0/glibtop.h
include/libgtop-2.0/glibtop/close.h
include/libgtop-2.0/glibtop/command.h
include/libgtop-2.0/glibtop/cpu.h
-include/libgtop-2.0/glibtop/error.h
include/libgtop-2.0/glibtop/fsusage.h
include/libgtop-2.0/glibtop/global.h
include/libgtop-2.0/glibtop/gnuserv.h
@@ -13,8 +12,8 @@ include/libgtop-2.0/glibtop/loadavg.h
include/libgtop-2.0/glibtop/mem.h
include/libgtop-2.0/glibtop/mountlist.h
include/libgtop-2.0/glibtop/msg_limits.h
+include/libgtop-2.0/glibtop/netlist.h
include/libgtop-2.0/glibtop/netload.h
-include/libgtop-2.0/glibtop/open.h
include/libgtop-2.0/glibtop/parameter.h
include/libgtop-2.0/glibtop/ppp.h
include/libgtop-2.0/glibtop/procargs.h
@@ -22,27 +21,25 @@ include/libgtop-2.0/glibtop/prockernel.h
include/libgtop-2.0/glibtop/proclist.h
include/libgtop-2.0/glibtop/procmap.h
include/libgtop-2.0/glibtop/procmem.h
+include/libgtop-2.0/glibtop/procopenfiles.h
include/libgtop-2.0/glibtop/procsegment.h
include/libgtop-2.0/glibtop/procsignal.h
include/libgtop-2.0/glibtop/procstate.h
include/libgtop-2.0/glibtop/proctime.h
include/libgtop-2.0/glibtop/procuid.h
-include/libgtop-2.0/glibtop/read.h
-include/libgtop-2.0/glibtop/read_data.h
include/libgtop-2.0/glibtop/sem_limits.h
include/libgtop-2.0/glibtop/shm_limits.h
include/libgtop-2.0/glibtop/signal.h
include/libgtop-2.0/glibtop/swap.h
include/libgtop-2.0/glibtop/sysdeps.h
include/libgtop-2.0/glibtop/sysinfo.h
-include/libgtop-2.0/glibtop/types.h
include/libgtop-2.0/glibtop/union.h
include/libgtop-2.0/glibtop/uptime.h
include/libgtop-2.0/glibtop/version.h
-include/libgtop-2.0/glibtop/write.h
include/libgtop-2.0/glibtop_machine.h
include/libgtop-2.0/glibtop_server.h
include/libgtop-2.0/glibtop_suid.h
+include/libgtop-2.0/libgtopconfig.h
lib/libgtop-2.0.a
lib/libgtop-2.0.so
lib/libgtop-2.0.so.2
@@ -87,6 +84,7 @@ share/locale/ml/LC_MESSAGES/libgtop-2.0.mo
share/locale/mn/LC_MESSAGES/libgtop-2.0.mo
share/locale/ms/LC_MESSAGES/libgtop-2.0.mo
share/locale/nb/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ne/LC_MESSAGES/libgtop-2.0.mo
share/locale/nl/LC_MESSAGES/libgtop-2.0.mo
share/locale/nn/LC_MESSAGES/libgtop-2.0.mo
share/locale/no/LC_MESSAGES/libgtop-2.0.mo
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 5170f104b1fa..ca0ae8b1291e 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gedit
-PORTVERSION= 2.8.3
+PORTVERSION= 2.10.0
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -23,16 +23,16 @@ INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_LIBTOOL_VER=15
-USE_GNOME= gnomeprefix gnomehack intlhack gnomehier \
+USE_GNOME= gnomeprefix gnomehack intlhack \
libgnomeprintui libgnomeui eel2 gtksourceview desktopfileutils
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-PLIST_SUB= VERSION="2.8"
+PLIST_SUB= VERSION="2.10"
MAN1= gedit.1
GCONF_SCHEMAS= gedit.schemas
post-install:
- @-update-desktop-database > /dev/null
+ @-update-desktop-database
.include <bsd.port.mk>
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index dafbcd5a161f..7d546ded534c 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gedit-2.8.3.tar.bz2) = 091b399294b8f5f9598da00c05868e23
-SIZE (gnome2/gedit-2.8.3.tar.bz2) = 2539284
+MD5 (gnome2/gedit-2.10.0.tar.bz2) = 933f551489ca8303a07f3cd0c42d5881
+SIZE (gnome2/gedit-2.10.0.tar.bz2) = 3097584
diff --git a/editors/gedit/files/patch-plugins_spell_gedit-spell-checker.c b/editors/gedit/files/patch-plugins_spell_gedit-spell-checker.c
new file mode 100644
index 000000000000..5110fb708c4f
--- /dev/null
+++ b/editors/gedit/files/patch-plugins_spell_gedit-spell-checker.c
@@ -0,0 +1,13 @@
+--- plugins/spell/gedit-spell-checker.c.orig Wed Dec 1 20:03:36 2004
++++ plugins/spell/gedit-spell-checker.c Wed Dec 1 20:03:59 2004
+@@ -319,9 +319,9 @@
+ static const GeditLanguage*
+ get_language_from_abrev (const gchar *abrev)
+ {
++ const GSList *langs;
+ g_return_val_if_fail (abrev != NULL, NULL);
+
+- const GSList *langs;
+ langs = gedit_spell_checker_get_available_languages ();
+
+ while (langs != NULL)
diff --git a/editors/gedit/files/patch-plugins_taglist_gedit-taglist-plugin-parser.c b/editors/gedit/files/patch-plugins_taglist_gedit-taglist-plugin-parser.c
new file mode 100644
index 000000000000..81f704d8c5c9
--- /dev/null
+++ b/editors/gedit/files/patch-plugins_taglist_gedit-taglist-plugin-parser.c
@@ -0,0 +1,18 @@
+--- plugins/taglist/gedit-taglist-plugin-parser.c.orig Wed Jan 26 19:28:35 2005
++++ plugins/taglist/gedit-taglist-plugin-parser.c Wed Jan 26 19:28:58 2005
+@@ -276,12 +276,13 @@
+ else
+ {
+ const char * const *langs_pointer;
++ gchar* lang;
+ gint i;
++ gint cur_lanking = 1;
+
+ langs_pointer = g_get_language_names ();
+
+- gchar* lang= (gchar*)xmlGetProp (cur, (const xmlChar*) "lang");
+- gint cur_lanking = 1;
++ lang= (gchar*)xmlGetProp (cur, (const xmlChar*) "lang");
+
+ /*
+ * When found a new TagGroup, append the best
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index fe65e82adfb8..d3732cae1da8 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -5,6 +5,7 @@ include/gedit-%%VERSION%%/gedit/bonobo-mdi.h
include/gedit-%%VERSION%%/gedit/gedit-convert.h
include/gedit-%%VERSION%%/gedit/gedit-debug.h
include/gedit-%%VERSION%%/gedit/gedit-document.h
+include/gedit-%%VERSION%%/gedit/gedit-encodings-option-menu.h
include/gedit-%%VERSION%%/gedit/gedit-encodings.h
include/gedit-%%VERSION%%/gedit/gedit-file.h
include/gedit-%%VERSION%%/gedit/gedit-mdi-child.h
@@ -26,7 +27,6 @@ include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-util.h
include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-bonobo.h
include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-gtk.h
include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view.h
-lib/bonobo/libgedit-control.so
lib/gedit-2/plugins/changecase.gedit-plugin
lib/gedit-2/plugins/docinfo.gedit-plugin
lib/gedit-2/plugins/indent.gedit-plugin
@@ -34,12 +34,14 @@ lib/gedit-2/plugins/libchangecase.so
lib/gedit-2/plugins/libdocinfo.so
lib/gedit-2/plugins/libindent.so
lib/gedit-2/plugins/libsample.so
+lib/gedit-2/plugins/libsavecopy.so
lib/gedit-2/plugins/libshell_output.so
lib/gedit-2/plugins/libsort.so
lib/gedit-2/plugins/libspell.so
lib/gedit-2/plugins/libtaglist.so
lib/gedit-2/plugins/libtime.so
lib/gedit-2/plugins/sample.gedit-plugin
+lib/gedit-2/plugins/savecopy.gedit-plugin
lib/gedit-2/plugins/shell_output.gedit-plugin
lib/gedit-2/plugins/sort.gedit-plugin
lib/gedit-2/plugins/spell.gedit-plugin
@@ -68,7 +70,6 @@ share/gnome/gedit-2/taglist/HTML.tags
share/gnome/gedit-2/taglist/Latex.tags
share/gnome/gedit-2/taglist/XSLT.tags
share/gnome/gedit-2/ui/gedit-ui.xml
-share/gnome/gnome-2.0/ui/gedit-viewer-ui.xml
share/gnome/help/gedit/C/figures/gedit_format_bold.png
share/gnome/help/gedit/C/figures/gedit_format_italic.png
share/gnome/help/gedit/C/figures/gedit_format_strikethrough.png
diff --git a/editors/gnome2-office/Makefile b/editors/gnome2-office/Makefile
index e583d0a40486..3c12c9059762 100644
--- a/editors/gnome2-office/Makefile
+++ b/editors/gnome2-office/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnome2-office
-PORTVERSION= 2.8.3
+PORTVERSION= 2.10.0
CATEGORIES= editors gnome
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
index cfc08d4f3f99..f9b6017459aa 100644
--- a/games/gnome-games-extra-data/Makefile
+++ b/games/gnome-games-extra-data/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomegames2-extra-data
-PORTVERSION= 2.8.0
+PORTVERSION= 2.10.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.8
+MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.10
DISTNAME= gnome-games-extra-data-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/games/gnome-games-extra-data/distinfo b/games/gnome-games-extra-data/distinfo
index 8327f7a2740c..aac4e3c29660 100644
--- a/games/gnome-games-extra-data/distinfo
+++ b/games/gnome-games-extra-data/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 6a3252a66e3c3ac09e2f951ee2d726b2
-SIZE (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 3582341
+MD5 (gnome2/gnome-games-extra-data-2.10.0.tar.bz2) = 344c36ae58fa13fd4b180bd9fefe94d0
+SIZE (gnome2/gnome-games-extra-data-2.10.0.tar.bz2) = 3566365
diff --git a/games/gnome-games-extra-data/pkg-plist b/games/gnome-games-extra-data/pkg-plist
index 4d53d44d82b3..ac96ec5afe0a 100644
--- a/games/gnome-games-extra-data/pkg-plist
+++ b/games/gnome-games-extra-data/pkg-plist
@@ -1,3 +1,7 @@
+share/gnome/gnome-games/same-gnome/themes/2.10/blink.png
+share/gnome/gnome-games/same-gnome/themes/2.10/glass.png
+share/gnome/gnome-games/same-gnome/themes/2.10/marbles.png
+share/gnome/gnome-games/same-gnome/themes/2.10/rotate.svg
share/gnome/pixmaps/glines/classic.png
share/gnome/pixmaps/glines/dots.png
share/gnome/pixmaps/glines/gumball.png
@@ -24,8 +28,6 @@ share/gnome/pixmaps/mahjongg/default.png
share/gnome/pixmaps/mahjongg/default2.png
share/gnome/pixmaps/mahjongg/maya.png
share/gnome/pixmaps/mahjongg/seta.png
-share/gnome/pixmaps/same-gnome/blink-sync.png
-share/gnome/pixmaps/same-gnome/glass.png
-share/gnome/pixmaps/same-gnome/marbles.png
-share/gnome/pixmaps/same-gnome/rotate.png
-@dirrm share/gnome/pixmaps/same-gnome
+@dirrm share/gnome/gnome-games/same-gnome/themes/2.10
+@dirrm share/gnome/gnome-games/same-gnome/themes
+@dirrm share/gnome/gnome-games/same-gnome
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index eba339873a13..b36d2def0e2d 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomegames2
-PORTVERSION= 2.8.3
+PORTVERSION= 2.10.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-games/2.8
+MASTER_SITE_SUBDIR= sources/gnome-games/2.10
DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,11 +19,12 @@ COMMENT= The game applications package for the Gnome 2 Desktop Environment
LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_PYTHON= yes
INSTALLS_OMF= yes
+USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libgnomeui \
+USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \
librsvg2 desktopfileutils
USE_LIBTOOL_VER=15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -32,16 +33,24 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= aisleriot.schemas blackjack.schemas gataxx.schemas \
glines.schemas gnect.schemas gnibbles.schemas gnobots2.schemas \
gnome-stones.schemas gnometris.schemas gnomine.schemas \
- gnotravex.schemas gtali.schemas iagno.schemas mahjongg.schemas \
- same-gnome.schemas
+ gnotravex.schemas gnotski.schemas gtali.schemas iagno.schemas \
+ libgnomegames.schemas mahjongg.schemas same-gnome.schemas
CONFLICTS= sol-1.0.*
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/libhowl.so) || defined(WITH_MDNS)
+LIB_DEPENDS+= howl:${PORTSDIR}/net/howl
+.endif
+
post-patch:
@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
's|malloc\.h|stdlib.h|g'
+ @${REINPLACE_CMD} -e 's|bin/python|bin/env python|g' \
+ ${WRKSRC}/libgames-support/games-server.py
post-install:
- @-update-desktop-database > /dev/null
+ @-update-desktop-database
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 2104d853d2e5..504bc5c7fce3 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-games-2.8.3.tar.bz2) = 0ee8f7cb3a95a5e69a7c9cbb4dc6c66a
-SIZE (gnome2/gnome-games-2.8.3.tar.bz2) = 5923240
+MD5 (gnome2/gnome-games-2.10.0.tar.bz2) = c3a1a8fd025a0174efa70d4e480114cf
+SIZE (gnome2/gnome-games-2.10.0.tar.bz2) = 5292770
diff --git a/games/gnome-games/files/patch-iagno_othello.c b/games/gnome-games/files/patch-iagno_othello.c
index 84b963a911e2..1d6d8e88a6a7 100644
--- a/games/gnome-games/files/patch-iagno_othello.c
+++ b/games/gnome-games/files/patch-iagno_othello.c
@@ -1,29 +1,20 @@
---- iagno/othello.c.orig Mon Feb 14 12:07:12 2005
-+++ iagno/othello.c Mon Feb 14 12:07:47 2005
-@@ -551,7 +551,7 @@
- memcpy (tboard, board, sizeof (gint8) * 8 * 8);
- move_board(tboard, i, j, me, 0);
-
-- // assume that opponent takes best move
-+ /* assume that opponent takes best move */
- tmp_move = find_best_move(tboard, not_me, ply_depth-1,
- -pass_thresh, -use_thresh, 0, 0);
-
-@@ -808,14 +808,14 @@
+--- iagno/othello.c.orig Tue Jan 25 11:24:35 2005
++++ iagno/othello.c Tue Jan 25 11:24:56 2005
+@@ -784,14 +784,14 @@
found_free = TRUE;
}
- // check if a player is dead
+ /* check if a player is dead */
if (!found_me && found_not_me)
- return (-10000);
+ return (S_LOSING_GAME);
else if (found_me && !found_not_me)
- return (10000);
+ return (S_WINNING_GAME);
- // if the game is finished, return the actual score rather than
- // a huristic
+ /* if the game is finished, return the actual score rather than
-+ a huristic */
++ * a huristic */
if (!found_free)
return (actual_score);
diff --git a/games/gnome-games/pkg-install b/games/gnome-games/pkg-install
index da897732169d..7b1b35161239 100644
--- a/games/gnome-games/pkg-install
+++ b/games/gnome-games/pkg-install
@@ -5,7 +5,7 @@ PATH=/bin:/usr/bin:/usr/sbin
case $2 in
POST-INSTALL)
mkdir -p ${PKG_PREFIX}/share/gnome/games
- SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores"
+ SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.score gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores"
for i in ${SCORES}; do
if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then
touch -f ${PKG_PREFIX}/share/gnome/games/${i}
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 6df66145aa97..18e3c7765d79 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -1,4 +1,5 @@
bin/blackjack
+bin/games-server.py
bin/gataxx
bin/glines
bin/gnect
@@ -14,7 +15,6 @@ bin/iagno
bin/mahjongg
bin/same-gnome
bin/sol
-etc/sound/events/gnect.soundlist
etc/sound/events/gnibbles.soundlist
etc/sound/events/gnobots2.soundlist
etc/sound/events/iagno.soundlist
@@ -78,6 +78,7 @@ share/gnome/blackjack/Vegas_Strip.rules
@unexec [ -s %D/share/gnome/games/gnotravex.5x5.scores ] || rm -f %D/share/gnome/games/gnotravex.5x5.scores
@unexec [ -s %D/share/gnome/games/gnotravex.6x6.scores ] || rm -f %D/share/gnome/games/gnotravex.6x6.scores
@unexec [ -s %D/share/gnome/games/gnotski.1.scores ] || rm -f %D/share/gnome/games/gnotski.1.scores
+@unexec [ -s %D/share/gnome/games/gnotski.10.scores ] || rm -f %D/share/gnome/games/gnotski.10.scores
@unexec [ -s %D/share/gnome/games/gnotski.11.scores ] || rm -f %D/share/gnome/games/gnotski.11.scores
@unexec [ -s %D/share/gnome/games/gnotski.12.scores ] || rm -f %D/share/gnome/games/gnotski.12.scores
@unexec [ -s %D/share/gnome/games/gnotski.13.scores ] || rm -f %D/share/gnome/games/gnotski.13.scores
@@ -85,18 +86,34 @@ share/gnome/blackjack/Vegas_Strip.rules
@unexec [ -s %D/share/gnome/games/gnotski.15.scores ] || rm -f %D/share/gnome/games/gnotski.15.scores
@unexec [ -s %D/share/gnome/games/gnotski.16.scores ] || rm -f %D/share/gnome/games/gnotski.16.scores
@unexec [ -s %D/share/gnome/games/gnotski.17.scores ] || rm -f %D/share/gnome/games/gnotski.17.scores
+@unexec [ -s %D/share/gnome/games/gnotski.18.scores ] || rm -f %D/share/gnome/games/gnotski.18.scores
+@unexec [ -s %D/share/gnome/games/gnotski.19.scores ] || rm -f %D/share/gnome/games/gnotski.19.scores
@unexec [ -s %D/share/gnome/games/gnotski.2.scores ] || rm -f %D/share/gnome/games/gnotski.2.scores
+@unexec [ -s %D/share/gnome/games/gnotski.20.scores ] || rm -f %D/share/gnome/games/gnotski.20.scores
@unexec [ -s %D/share/gnome/games/gnotski.21.scores ] || rm -f %D/share/gnome/games/gnotski.21.scores
@unexec [ -s %D/share/gnome/games/gnotski.22.scores ] || rm -f %D/share/gnome/games/gnotski.22.scores
@unexec [ -s %D/share/gnome/games/gnotski.23.scores ] || rm -f %D/share/gnome/games/gnotski.23.scores
@unexec [ -s %D/share/gnome/games/gnotski.24.scores ] || rm -f %D/share/gnome/games/gnotski.24.scores
@unexec [ -s %D/share/gnome/games/gnotski.25.scores ] || rm -f %D/share/gnome/games/gnotski.25.scores
@unexec [ -s %D/share/gnome/games/gnotski.26.scores ] || rm -f %D/share/gnome/games/gnotski.26.scores
+@unexec [ -s %D/share/gnome/games/gnotski.27.scores ] || rm -f %D/share/gnome/games/gnotski.27.scores
+@unexec [ -s %D/share/gnome/games/gnotski.28.scores ] || rm -f %D/share/gnome/games/gnotski.28.scores
+@unexec [ -s %D/share/gnome/games/gnotski.29.scores ] || rm -f %D/share/gnome/games/gnotski.29.scores
@unexec [ -s %D/share/gnome/games/gnotski.3.scores ] || rm -f %D/share/gnome/games/gnotski.3.scores
+@unexec [ -s %D/share/gnome/games/gnotski.30.scores ] || rm -f %D/share/gnome/games/gnotski.30.scores
+@unexec [ -s %D/share/gnome/games/gnotski.31.scores ] || rm -f %D/share/gnome/games/gnotski.31.scores
+@unexec [ -s %D/share/gnome/games/gnotski.32.scores ] || rm -f %D/share/gnome/games/gnotski.32.scores
+@unexec [ -s %D/share/gnome/games/gnotski.33.scores ] || rm -f %D/share/gnome/games/gnotski.33.scores
+@unexec [ -s %D/share/gnome/games/gnotski.34.scores ] || rm -f %D/share/gnome/games/gnotski.34.scores
+@unexec [ -s %D/share/gnome/games/gnotski.35.scores ] || rm -f %D/share/gnome/games/gnotski.35.scores
+@unexec [ -s %D/share/gnome/games/gnotski.36.scores ] || rm -f %D/share/gnome/games/gnotski.36.scores
+@unexec [ -s %D/share/gnome/games/gnotski.37.scores ] || rm -f %D/share/gnome/games/gnotski.37.scores
@unexec [ -s %D/share/gnome/games/gnotski.4.scores ] || rm -f %D/share/gnome/games/gnotski.4.scores
@unexec [ -s %D/share/gnome/games/gnotski.5.scores ] || rm -f %D/share/gnome/games/gnotski.5.scores
@unexec [ -s %D/share/gnome/games/gnotski.6.scores ] || rm -f %D/share/gnome/games/gnotski.6.scores
@unexec [ -s %D/share/gnome/games/gnotski.7.scores ] || rm -f %D/share/gnome/games/gnotski.7.scores
+@unexec [ -s %D/share/gnome/games/gnotski.8.scores ] || rm -f %D/share/gnome/games/gnotski.8.scores
+@unexec [ -s %D/share/gnome/games/gnotski.9.scores ] || rm -f %D/share/gnome/games/gnotski.9.scores
@unexec [ -s %D/share/gnome/games/gtali.scores ] || rm -f %D/share/gnome/games/gtali.scores
@unexec [ -s %D/share/gnome/games/mahjongg.bridges.scores ] || rm -f %D/share/gnome/games/mahjongg.bridges.scores
@unexec [ -s %D/share/gnome/games/mahjongg.cloud.scores ] || rm -f %D/share/gnome/games/mahjongg.cloud.scores
@@ -107,7 +124,9 @@ share/gnome/blackjack/Vegas_Strip.rules
@unexec [ -s %D/share/gnome/games/mahjongg.pyramid.scores ] || rm -f %D/share/gnome/games/mahjongg.pyramid.scores
@unexec [ -s %D/share/gnome/games/mahjongg.tictactoe.scores ] || rm -f %D/share/gnome/games/mahjongg.tictactoe.scores
@unexec [ -s %D/share/gnome/games/mahjongg.ziggurat.scores ] || rm -f %D/share/gnome/games/mahjongg.ziggurat.scores
-@unexec [ -s %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores
+@unexec [ -s %D/share/gnome/games/same-gnome.Large.scores ] || rm -f %D/share/gnome/games/same-gnome.Large.scores
+@unexec [ -s %D/share/gnome/games/same-gnome.Medium.scores ] || rm -f %D/share/gnome/games/same-gnome.Medium.scores
+@unexec [ -s %D/share/gnome/games/same-gnome.Small.scores ] || rm -f %D/share/gnome/games/same-gnome.Small.scores
share/gnome/gnect/white_ob.cn4
share/gnome/gnibbles/level001.gnl
share/gnome/gnibbles/level002.gnl
@@ -140,6 +159,9 @@ share/gnome/gnobots2/nightmare.cfg
share/gnome/gnobots2/robots2.cfg
share/gnome/gnobots2/robots2_easy.cfg
share/gnome/gnobots2/robots_with_safe_teleport.cfg
+share/gnome/gnome-games/mahjongg/maps/mahjongg.map
+share/gnome/gnome-games/same-gnome/themes/2.10/planets.png
+share/gnome/gnome-games/same-gnome/themes/2.10/stones.png
share/gnome/gnome-stones/atari.caves
share/gnome/gnome-stones/default.caves
share/gnome/gnome-stones/gnome-stonesrc
@@ -223,6 +245,83 @@ share/gnome/help/aisleriot/C/will_o_the_wisp.xml
share/gnome/help/aisleriot/C/yield.xml
share/gnome/help/aisleriot/C/yukon.xml
share/gnome/help/aisleriot/C/zebra.xml
+share/gnome/help/aisleriot/fr/agnes.xml
+share/gnome/help/aisleriot/fr/aisleriot.xml
+share/gnome/help/aisleriot/fr/auld_lang_syne.xml
+share/gnome/help/aisleriot/fr/bakers_dozen.xml
+share/gnome/help/aisleriot/fr/bakers_game.xml
+share/gnome/help/aisleriot/fr/beleaguered_castle.xml
+share/gnome/help/aisleriot/fr/block_ten.xml
+share/gnome/help/aisleriot/fr/bristol.xml
+share/gnome/help/aisleriot/fr/camelot.xml
+share/gnome/help/aisleriot/fr/canfield.xml
+share/gnome/help/aisleriot/fr/chessboard.xml
+share/gnome/help/aisleriot/fr/clock.xml
+share/gnome/help/aisleriot/fr/cover.xml
+share/gnome/help/aisleriot/fr/definitions.xml
+share/gnome/help/aisleriot/fr/diamond_mine.xml
+share/gnome/help/aisleriot/fr/doublets.xml
+share/gnome/help/aisleriot/fr/eagle-wing.xml
+share/gnome/help/aisleriot/fr/easthaven.xml
+share/gnome/help/aisleriot/fr/eight_off.xml
+share/gnome/help/aisleriot/fr/elevator.xml
+share/gnome/help/aisleriot/fr/escalator.xml
+share/gnome/help/aisleriot/fr/figures/camelot-goal.png
+share/gnome/help/aisleriot/fr/figures/clock-rules.png
+share/gnome/help/aisleriot/fr/first_law.xml
+share/gnome/help/aisleriot/fr/fortress.xml
+share/gnome/help/aisleriot/fr/fortunes.xml
+share/gnome/help/aisleriot/fr/fourteen.xml
+share/gnome/help/aisleriot/fr/freecell.xml
+share/gnome/help/aisleriot/fr/gay_gordons.xml
+share/gnome/help/aisleriot/fr/glenwood.xml
+share/gnome/help/aisleriot/fr/golf.xml
+share/gnome/help/aisleriot/fr/gypsy.xml
+share/gnome/help/aisleriot/fr/helsinki.xml
+share/gnome/help/aisleriot/fr/hopscotch.xml
+share/gnome/help/aisleriot/fr/isabel.xml
+share/gnome/help/aisleriot/fr/jamestown.xml
+share/gnome/help/aisleriot/fr/jumbo.xml
+share/gnome/help/aisleriot/fr/kansas.xml
+share/gnome/help/aisleriot/fr/king_albert.xml
+share/gnome/help/aisleriot/fr/klondike.xml
+share/gnome/help/aisleriot/fr/labyrinth.xml
+share/gnome/help/aisleriot/fr/lady_jane.xml
+share/gnome/help/aisleriot/fr/legal.xml
+share/gnome/help/aisleriot/fr/maze.xml
+share/gnome/help/aisleriot/fr/monte_carlo.xml
+share/gnome/help/aisleriot/fr/neighbor.xml
+share/gnome/help/aisleriot/fr/odessa.xml
+share/gnome/help/aisleriot/fr/osmosis.xml
+share/gnome/help/aisleriot/fr/peek.xml
+share/gnome/help/aisleriot/fr/pileon.xml
+share/gnome/help/aisleriot/fr/plait.xml
+share/gnome/help/aisleriot/fr/poker.xml
+share/gnome/help/aisleriot/fr/quatorze.xml
+share/gnome/help/aisleriot/fr/royal_east.xml
+share/gnome/help/aisleriot/fr/scorpion.xml
+share/gnome/help/aisleriot/fr/scuffle.xml
+share/gnome/help/aisleriot/fr/seahaven.xml
+share/gnome/help/aisleriot/fr/sir_tommy.xml
+share/gnome/help/aisleriot/fr/spider.xml
+share/gnome/help/aisleriot/fr/spider_one_suit.xml
+share/gnome/help/aisleriot/fr/spider_two_suit.xml
+share/gnome/help/aisleriot/fr/spiderette.xml
+share/gnome/help/aisleriot/fr/straight_up.xml
+share/gnome/help/aisleriot/fr/streets_and_alleys.xml
+share/gnome/help/aisleriot/fr/ten_across.xml
+share/gnome/help/aisleriot/fr/thieves.xml
+share/gnome/help/aisleriot/fr/thirteen.xml
+share/gnome/help/aisleriot/fr/thumb_and_pouch.xml
+share/gnome/help/aisleriot/fr/treize.xml
+share/gnome/help/aisleriot/fr/union_square.xml
+share/gnome/help/aisleriot/fr/valentine.xml
+share/gnome/help/aisleriot/fr/westhaven.xml
+share/gnome/help/aisleriot/fr/whitehead.xml
+share/gnome/help/aisleriot/fr/will_o_the_wisp.xml
+share/gnome/help/aisleriot/fr/yield.xml
+share/gnome/help/aisleriot/fr/yukon.xml
+share/gnome/help/aisleriot/fr/zebra.xml
share/gnome/help/blackjack/C/blackjack.xml
share/gnome/help/blackjack/C/figures/blackjack_start_window.png
share/gnome/help/blackjack/C/figures/blackjack_win_window.png
@@ -302,19 +401,17 @@ share/gnome/help/mahjongg/C/figures/mahjongg.png
share/gnome/help/mahjongg/C/figures/no-match.png
share/gnome/help/mahjongg/C/figures/no-move.png
share/gnome/help/mahjongg/C/figures/preferences.png
-share/gnome/help/mahjongg/C/figures/seed.png
share/gnome/help/mahjongg/C/figures/toolbar.png
share/gnome/help/mahjongg/C/legal.xml
share/gnome/help/mahjongg/C/mahjongg.xml
-share/gnome/help/same-gnome/C/figures/blink-sync.png
-share/gnome/help/same-gnome/C/figures/preferences.png
-share/gnome/help/same-gnome/C/figures/same-main-window.png
-share/gnome/help/same-gnome/C/figures/same-planets-fig.png
+share/gnome/help/same-gnome/C/figures/play.png
+share/gnome/help/same-gnome/C/figures/start-up.png
share/gnome/help/same-gnome/C/legal.xml
share/gnome/help/same-gnome/C/same-gnome.xml
share/gnome/mime-info/gnome-stones.keys
share/gnome/mime-info/gnome-stones.mime
share/gnome/omf/gnome-games/aisleriot-C.omf
+share/gnome/omf/gnome-games/aisleriot-fr.omf
share/gnome/omf/gnome-games/blackjack-C.omf
share/gnome/omf/gnome-games/gataxx-C.omf
share/gnome/omf/gnome-games/glines-C.omf
@@ -341,7 +438,7 @@ share/gnome/pixmaps/blackjack/chip-100.svg
share/gnome/pixmaps/blackjack/chip-25.svg
share/gnome/pixmaps/blackjack/chip-5.svg
share/gnome/pixmaps/cards/baize.png
-share/gnome/pixmaps/cards/slot.png
+share/gnome/pixmaps/cards/slot.svg
share/gnome/pixmaps/cards/slots/white-outline.svg
share/gnome/pixmaps/gataxx.png
share/gnome/pixmaps/glines.png
@@ -391,11 +488,11 @@ share/gnome/pixmaps/gnobots2/gnomes.png
share/gnome/pixmaps/gnobots2/robots.png
share/gnome/pixmaps/gnobots2/splat.png
share/gnome/pixmaps/gnobots2/yahoo.png
-share/gnome/pixmaps/gnome-games-common/cards/bonded.png
-share/gnome/pixmaps/gnome-games-common/cards/paris.svg
share/gnome/pixmaps/gnome-aisleriot.png
share/gnome/pixmaps/gnome-blackjack.png
share/gnome/pixmaps/gnome-cardgame.png
+share/gnome/pixmaps/gnome-games-common/cards/bonded.png
+share/gnome/pixmaps/gnome-games-common/cards/paris.svg
share/gnome/pixmaps/gnome-gnobots2.png
share/gnome/pixmaps/gnome-gnomine.png
share/gnome/pixmaps/gnome-gnotravex.png
@@ -434,7 +531,7 @@ share/gnome/pixmaps/gnomine/flag-question.svg
share/gnome/pixmaps/gnomine/flag.svg
share/gnome/pixmaps/gnomine/mine.svg
share/gnome/pixmaps/gnotski-icon.png
-share/gnome/pixmaps/gnotski.png
+share/gnome/pixmaps/gnotski.svg
share/gnome/pixmaps/gtali/gnome-dice-1.svg
share/gnome/pixmaps/gtali/gnome-dice-2.svg
share/gnome/pixmaps/gtali/gnome-dice-3.svg
@@ -448,8 +545,6 @@ share/gnome/pixmaps/iagno/woodtrim.png
share/gnome/pixmaps/mahjongg/postmodern.svg
share/gnome/pixmaps/mahjongg/smooth.png
share/gnome/pixmaps/rteleport.png
-share/gnome/pixmaps/same-gnome/planets.png
-share/gnome/pixmaps/same-gnome/stones.png
share/gnome/pixmaps/teleport.png
share/gnome/sol-games/agnes.scm
share/gnome/sol-games/auld_lang_syne.scm
@@ -616,7 +711,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/sounds/gnibbles
@dirrm share/gnome/sol-games/glade
@dirrm share/gnome/sol-games
-@dirrm share/gnome/pixmaps/same-gnome
@dirrm share/gnome/pixmaps/mahjongg
@dirrm share/gnome/pixmaps/iagno
@dirrm share/gnome/pixmaps/gtali
@@ -681,10 +775,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/help/blackjack/C/figures
@dirrm share/gnome/help/blackjack/C
@dirrm share/gnome/help/blackjack
+@dirrm share/gnome/help/aisleriot/fr/figures
+@dirrm share/gnome/help/aisleriot/fr
@dirrm share/gnome/help/aisleriot/C/figures
@dirrm share/gnome/help/aisleriot/C
@dirrm share/gnome/help/aisleriot
@dirrm share/gnome/gnome-stones
+@dirrm share/gnome/gnome-games/same-gnome/themes/2.10
+@dirrm share/gnome/gnome-games/same-gnome/themes
+@dirrm share/gnome/gnome-games/same-gnome
+@dirrm share/gnome/gnome-games/mahjongg/maps
+@dirrm share/gnome/gnome-games/mahjongg
+@dirrm share/gnome/gnome-games
@dirrm share/gnome/gnobots2
@dirrm share/gnome/gnibbles
@dirrm share/gnome/gnect
diff --git a/games/gnomegames2-extra-data/Makefile b/games/gnomegames2-extra-data/Makefile
index cfc08d4f3f99..f9b6017459aa 100644
--- a/games/gnomegames2-extra-data/Makefile
+++ b/games/gnomegames2-extra-data/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomegames2-extra-data
-PORTVERSION= 2.8.0
+PORTVERSION= 2.10.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.8
+MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.10
DISTNAME= gnome-games-extra-data-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/games/gnomegames2-extra-data/distinfo b/games/gnomegames2-extra-data/distinfo
index 8327f7a2740c..aac4e3c29660 100644
--- a/games/gnomegames2-extra-data/distinfo
+++ b/games/gnomegames2-extra-data/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 6a3252a66e3c3ac09e2f951ee2d726b2
-SIZE (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 3582341
+MD5 (gnome2/gnome-games-extra-data-2.10.0.tar.bz2) = 344c36ae58fa13fd4b180bd9fefe94d0
+SIZE (gnome2/gnome-games-extra-data-2.10.0.tar.bz2) = 3566365
diff --git a/games/gnomegames2-extra-data/pkg-plist b/games/gnomegames2-extra-data/pkg-plist
index 4d53d44d82b3..ac96ec5afe0a 100644
--- a/games/gnomegames2-extra-data/pkg-plist
+++ b/games/gnomegames2-extra-data/pkg-plist
@@ -1,3 +1,7 @@
+share/gnome/gnome-games/same-gnome/themes/2.10/blink.png
+share/gnome/gnome-games/same-gnome/themes/2.10/glass.png
+share/gnome/gnome-games/same-gnome/themes/2.10/marbles.png
+share/gnome/gnome-games/same-gnome/themes/2.10/rotate.svg
share/gnome/pixmaps/glines/classic.png
share/gnome/pixmaps/glines/dots.png
share/gnome/pixmaps/glines/gumball.png
@@ -24,8 +28,6 @@ share/gnome/pixmaps/mahjongg/default.png
share/gnome/pixmaps/mahjongg/default2.png
share/gnome/pixmaps/mahjongg/maya.png
share/gnome/pixmaps/mahjongg/seta.png
-share/gnome/pixmaps/same-gnome/blink-sync.png
-share/gnome/pixmaps/same-gnome/glass.png
-share/gnome/pixmaps/same-gnome/marbles.png
-share/gnome/pixmaps/same-gnome/rotate.png
-@dirrm share/gnome/pixmaps/same-gnome
+@dirrm share/gnome/gnome-games/same-gnome/themes/2.10
+@dirrm share/gnome/gnome-games/same-gnome/themes
+@dirrm share/gnome/gnome-games/same-gnome
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index eba339873a13..b36d2def0e2d 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomegames2
-PORTVERSION= 2.8.3
+PORTVERSION= 2.10.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-games/2.8
+MASTER_SITE_SUBDIR= sources/gnome-games/2.10
DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,11 +19,12 @@ COMMENT= The game applications package for the Gnome 2 Desktop Environment
LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_PYTHON= yes
INSTALLS_OMF= yes
+USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libgnomeui \
+USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \
librsvg2 desktopfileutils
USE_LIBTOOL_VER=15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -32,16 +33,24 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= aisleriot.schemas blackjack.schemas gataxx.schemas \
glines.schemas gnect.schemas gnibbles.schemas gnobots2.schemas \
gnome-stones.schemas gnometris.schemas gnomine.schemas \
- gnotravex.schemas gtali.schemas iagno.schemas mahjongg.schemas \
- same-gnome.schemas
+ gnotravex.schemas gnotski.schemas gtali.schemas iagno.schemas \
+ libgnomegames.schemas mahjongg.schemas same-gnome.schemas
CONFLICTS= sol-1.0.*
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/libhowl.so) || defined(WITH_MDNS)
+LIB_DEPENDS+= howl:${PORTSDIR}/net/howl
+.endif
+
post-patch:
@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
's|malloc\.h|stdlib.h|g'
+ @${REINPLACE_CMD} -e 's|bin/python|bin/env python|g' \
+ ${WRKSRC}/libgames-support/games-server.py
post-install:
- @-update-desktop-database > /dev/null
+ @-update-desktop-database
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo
index 2104d853d2e5..504bc5c7fce3 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-games-2.8.3.tar.bz2) = 0ee8f7cb3a95a5e69a7c9cbb4dc6c66a
-SIZE (gnome2/gnome-games-2.8.3.tar.bz2) = 5923240
+MD5 (gnome2/gnome-games-2.10.0.tar.bz2) = c3a1a8fd025a0174efa70d4e480114cf
+SIZE (gnome2/gnome-games-2.10.0.tar.bz2) = 5292770
diff --git a/games/gnomegames2/files/patch-iagno_othello.c b/games/gnomegames2/files/patch-iagno_othello.c
index 84b963a911e2..1d6d8e88a6a7 100644
--- a/games/gnomegames2/files/patch-iagno_othello.c
+++ b/games/gnomegames2/files/patch-iagno_othello.c
@@ -1,29 +1,20 @@
---- iagno/othello.c.orig Mon Feb 14 12:07:12 2005
-+++ iagno/othello.c Mon Feb 14 12:07:47 2005
-@@ -551,7 +551,7 @@
- memcpy (tboard, board, sizeof (gint8) * 8 * 8);
- move_board(tboard, i, j, me, 0);
-
-- // assume that opponent takes best move
-+ /* assume that opponent takes best move */
- tmp_move = find_best_move(tboard, not_me, ply_depth-1,
- -pass_thresh, -use_thresh, 0, 0);
-
-@@ -808,14 +808,14 @@
+--- iagno/othello.c.orig Tue Jan 25 11:24:35 2005
++++ iagno/othello.c Tue Jan 25 11:24:56 2005
+@@ -784,14 +784,14 @@
found_free = TRUE;
}
- // check if a player is dead
+ /* check if a player is dead */
if (!found_me && found_not_me)
- return (-10000);
+ return (S_LOSING_GAME);
else if (found_me && !found_not_me)
- return (10000);
+ return (S_WINNING_GAME);
- // if the game is finished, return the actual score rather than
- // a huristic
+ /* if the game is finished, return the actual score rather than
-+ a huristic */
++ * a huristic */
if (!found_free)
return (actual_score);
diff --git a/games/gnomegames2/pkg-install b/games/gnomegames2/pkg-install
index da897732169d..7b1b35161239 100644
--- a/games/gnomegames2/pkg-install
+++ b/games/gnomegames2/pkg-install
@@ -5,7 +5,7 @@ PATH=/bin:/usr/bin:/usr/sbin
case $2 in
POST-INSTALL)
mkdir -p ${PKG_PREFIX}/share/gnome/games
- SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores"
+ SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.score gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores"
for i in ${SCORES}; do
if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then
touch -f ${PKG_PREFIX}/share/gnome/games/${i}
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 6df66145aa97..18e3c7765d79 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -1,4 +1,5 @@
bin/blackjack
+bin/games-server.py
bin/gataxx
bin/glines
bin/gnect
@@ -14,7 +15,6 @@ bin/iagno
bin/mahjongg
bin/same-gnome
bin/sol
-etc/sound/events/gnect.soundlist
etc/sound/events/gnibbles.soundlist
etc/sound/events/gnobots2.soundlist
etc/sound/events/iagno.soundlist
@@ -78,6 +78,7 @@ share/gnome/blackjack/Vegas_Strip.rules
@unexec [ -s %D/share/gnome/games/gnotravex.5x5.scores ] || rm -f %D/share/gnome/games/gnotravex.5x5.scores
@unexec [ -s %D/share/gnome/games/gnotravex.6x6.scores ] || rm -f %D/share/gnome/games/gnotravex.6x6.scores
@unexec [ -s %D/share/gnome/games/gnotski.1.scores ] || rm -f %D/share/gnome/games/gnotski.1.scores
+@unexec [ -s %D/share/gnome/games/gnotski.10.scores ] || rm -f %D/share/gnome/games/gnotski.10.scores
@unexec [ -s %D/share/gnome/games/gnotski.11.scores ] || rm -f %D/share/gnome/games/gnotski.11.scores
@unexec [ -s %D/share/gnome/games/gnotski.12.scores ] || rm -f %D/share/gnome/games/gnotski.12.scores
@unexec [ -s %D/share/gnome/games/gnotski.13.scores ] || rm -f %D/share/gnome/games/gnotski.13.scores
@@ -85,18 +86,34 @@ share/gnome/blackjack/Vegas_Strip.rules
@unexec [ -s %D/share/gnome/games/gnotski.15.scores ] || rm -f %D/share/gnome/games/gnotski.15.scores
@unexec [ -s %D/share/gnome/games/gnotski.16.scores ] || rm -f %D/share/gnome/games/gnotski.16.scores
@unexec [ -s %D/share/gnome/games/gnotski.17.scores ] || rm -f %D/share/gnome/games/gnotski.17.scores
+@unexec [ -s %D/share/gnome/games/gnotski.18.scores ] || rm -f %D/share/gnome/games/gnotski.18.scores
+@unexec [ -s %D/share/gnome/games/gnotski.19.scores ] || rm -f %D/share/gnome/games/gnotski.19.scores
@unexec [ -s %D/share/gnome/games/gnotski.2.scores ] || rm -f %D/share/gnome/games/gnotski.2.scores
+@unexec [ -s %D/share/gnome/games/gnotski.20.scores ] || rm -f %D/share/gnome/games/gnotski.20.scores
@unexec [ -s %D/share/gnome/games/gnotski.21.scores ] || rm -f %D/share/gnome/games/gnotski.21.scores
@unexec [ -s %D/share/gnome/games/gnotski.22.scores ] || rm -f %D/share/gnome/games/gnotski.22.scores
@unexec [ -s %D/share/gnome/games/gnotski.23.scores ] || rm -f %D/share/gnome/games/gnotski.23.scores
@unexec [ -s %D/share/gnome/games/gnotski.24.scores ] || rm -f %D/share/gnome/games/gnotski.24.scores
@unexec [ -s %D/share/gnome/games/gnotski.25.scores ] || rm -f %D/share/gnome/games/gnotski.25.scores
@unexec [ -s %D/share/gnome/games/gnotski.26.scores ] || rm -f %D/share/gnome/games/gnotski.26.scores
+@unexec [ -s %D/share/gnome/games/gnotski.27.scores ] || rm -f %D/share/gnome/games/gnotski.27.scores
+@unexec [ -s %D/share/gnome/games/gnotski.28.scores ] || rm -f %D/share/gnome/games/gnotski.28.scores
+@unexec [ -s %D/share/gnome/games/gnotski.29.scores ] || rm -f %D/share/gnome/games/gnotski.29.scores
@unexec [ -s %D/share/gnome/games/gnotski.3.scores ] || rm -f %D/share/gnome/games/gnotski.3.scores
+@unexec [ -s %D/share/gnome/games/gnotski.30.scores ] || rm -f %D/share/gnome/games/gnotski.30.scores
+@unexec [ -s %D/share/gnome/games/gnotski.31.scores ] || rm -f %D/share/gnome/games/gnotski.31.scores
+@unexec [ -s %D/share/gnome/games/gnotski.32.scores ] || rm -f %D/share/gnome/games/gnotski.32.scores
+@unexec [ -s %D/share/gnome/games/gnotski.33.scores ] || rm -f %D/share/gnome/games/gnotski.33.scores
+@unexec [ -s %D/share/gnome/games/gnotski.34.scores ] || rm -f %D/share/gnome/games/gnotski.34.scores
+@unexec [ -s %D/share/gnome/games/gnotski.35.scores ] || rm -f %D/share/gnome/games/gnotski.35.scores
+@unexec [ -s %D/share/gnome/games/gnotski.36.scores ] || rm -f %D/share/gnome/games/gnotski.36.scores
+@unexec [ -s %D/share/gnome/games/gnotski.37.scores ] || rm -f %D/share/gnome/games/gnotski.37.scores
@unexec [ -s %D/share/gnome/games/gnotski.4.scores ] || rm -f %D/share/gnome/games/gnotski.4.scores
@unexec [ -s %D/share/gnome/games/gnotski.5.scores ] || rm -f %D/share/gnome/games/gnotski.5.scores
@unexec [ -s %D/share/gnome/games/gnotski.6.scores ] || rm -f %D/share/gnome/games/gnotski.6.scores
@unexec [ -s %D/share/gnome/games/gnotski.7.scores ] || rm -f %D/share/gnome/games/gnotski.7.scores
+@unexec [ -s %D/share/gnome/games/gnotski.8.scores ] || rm -f %D/share/gnome/games/gnotski.8.scores
+@unexec [ -s %D/share/gnome/games/gnotski.9.scores ] || rm -f %D/share/gnome/games/gnotski.9.scores
@unexec [ -s %D/share/gnome/games/gtali.scores ] || rm -f %D/share/gnome/games/gtali.scores
@unexec [ -s %D/share/gnome/games/mahjongg.bridges.scores ] || rm -f %D/share/gnome/games/mahjongg.bridges.scores
@unexec [ -s %D/share/gnome/games/mahjongg.cloud.scores ] || rm -f %D/share/gnome/games/mahjongg.cloud.scores
@@ -107,7 +124,9 @@ share/gnome/blackjack/Vegas_Strip.rules
@unexec [ -s %D/share/gnome/games/mahjongg.pyramid.scores ] || rm -f %D/share/gnome/games/mahjongg.pyramid.scores
@unexec [ -s %D/share/gnome/games/mahjongg.tictactoe.scores ] || rm -f %D/share/gnome/games/mahjongg.tictactoe.scores
@unexec [ -s %D/share/gnome/games/mahjongg.ziggurat.scores ] || rm -f %D/share/gnome/games/mahjongg.ziggurat.scores
-@unexec [ -s %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores
+@unexec [ -s %D/share/gnome/games/same-gnome.Large.scores ] || rm -f %D/share/gnome/games/same-gnome.Large.scores
+@unexec [ -s %D/share/gnome/games/same-gnome.Medium.scores ] || rm -f %D/share/gnome/games/same-gnome.Medium.scores
+@unexec [ -s %D/share/gnome/games/same-gnome.Small.scores ] || rm -f %D/share/gnome/games/same-gnome.Small.scores
share/gnome/gnect/white_ob.cn4
share/gnome/gnibbles/level001.gnl
share/gnome/gnibbles/level002.gnl
@@ -140,6 +159,9 @@ share/gnome/gnobots2/nightmare.cfg
share/gnome/gnobots2/robots2.cfg
share/gnome/gnobots2/robots2_easy.cfg
share/gnome/gnobots2/robots_with_safe_teleport.cfg
+share/gnome/gnome-games/mahjongg/maps/mahjongg.map
+share/gnome/gnome-games/same-gnome/themes/2.10/planets.png
+share/gnome/gnome-games/same-gnome/themes/2.10/stones.png
share/gnome/gnome-stones/atari.caves
share/gnome/gnome-stones/default.caves
share/gnome/gnome-stones/gnome-stonesrc
@@ -223,6 +245,83 @@ share/gnome/help/aisleriot/C/will_o_the_wisp.xml
share/gnome/help/aisleriot/C/yield.xml
share/gnome/help/aisleriot/C/yukon.xml
share/gnome/help/aisleriot/C/zebra.xml
+share/gnome/help/aisleriot/fr/agnes.xml
+share/gnome/help/aisleriot/fr/aisleriot.xml
+share/gnome/help/aisleriot/fr/auld_lang_syne.xml
+share/gnome/help/aisleriot/fr/bakers_dozen.xml
+share/gnome/help/aisleriot/fr/bakers_game.xml
+share/gnome/help/aisleriot/fr/beleaguered_castle.xml
+share/gnome/help/aisleriot/fr/block_ten.xml
+share/gnome/help/aisleriot/fr/bristol.xml
+share/gnome/help/aisleriot/fr/camelot.xml
+share/gnome/help/aisleriot/fr/canfield.xml
+share/gnome/help/aisleriot/fr/chessboard.xml
+share/gnome/help/aisleriot/fr/clock.xml
+share/gnome/help/aisleriot/fr/cover.xml
+share/gnome/help/aisleriot/fr/definitions.xml
+share/gnome/help/aisleriot/fr/diamond_mine.xml
+share/gnome/help/aisleriot/fr/doublets.xml
+share/gnome/help/aisleriot/fr/eagle-wing.xml
+share/gnome/help/aisleriot/fr/easthaven.xml
+share/gnome/help/aisleriot/fr/eight_off.xml
+share/gnome/help/aisleriot/fr/elevator.xml
+share/gnome/help/aisleriot/fr/escalator.xml
+share/gnome/help/aisleriot/fr/figures/camelot-goal.png
+share/gnome/help/aisleriot/fr/figures/clock-rules.png
+share/gnome/help/aisleriot/fr/first_law.xml
+share/gnome/help/aisleriot/fr/fortress.xml
+share/gnome/help/aisleriot/fr/fortunes.xml
+share/gnome/help/aisleriot/fr/fourteen.xml
+share/gnome/help/aisleriot/fr/freecell.xml
+share/gnome/help/aisleriot/fr/gay_gordons.xml
+share/gnome/help/aisleriot/fr/glenwood.xml
+share/gnome/help/aisleriot/fr/golf.xml
+share/gnome/help/aisleriot/fr/gypsy.xml
+share/gnome/help/aisleriot/fr/helsinki.xml
+share/gnome/help/aisleriot/fr/hopscotch.xml
+share/gnome/help/aisleriot/fr/isabel.xml
+share/gnome/help/aisleriot/fr/jamestown.xml
+share/gnome/help/aisleriot/fr/jumbo.xml
+share/gnome/help/aisleriot/fr/kansas.xml
+share/gnome/help/aisleriot/fr/king_albert.xml
+share/gnome/help/aisleriot/fr/klondike.xml
+share/gnome/help/aisleriot/fr/labyrinth.xml
+share/gnome/help/aisleriot/fr/lady_jane.xml
+share/gnome/help/aisleriot/fr/legal.xml
+share/gnome/help/aisleriot/fr/maze.xml
+share/gnome/help/aisleriot/fr/monte_carlo.xml
+share/gnome/help/aisleriot/fr/neighbor.xml
+share/gnome/help/aisleriot/fr/odessa.xml
+share/gnome/help/aisleriot/fr/osmosis.xml
+share/gnome/help/aisleriot/fr/peek.xml
+share/gnome/help/aisleriot/fr/pileon.xml
+share/gnome/help/aisleriot/fr/plait.xml
+share/gnome/help/aisleriot/fr/poker.xml
+share/gnome/help/aisleriot/fr/quatorze.xml
+share/gnome/help/aisleriot/fr/royal_east.xml
+share/gnome/help/aisleriot/fr/scorpion.xml
+share/gnome/help/aisleriot/fr/scuffle.xml
+share/gnome/help/aisleriot/fr/seahaven.xml
+share/gnome/help/aisleriot/fr/sir_tommy.xml
+share/gnome/help/aisleriot/fr/spider.xml
+share/gnome/help/aisleriot/fr/spider_one_suit.xml
+share/gnome/help/aisleriot/fr/spider_two_suit.xml
+share/gnome/help/aisleriot/fr/spiderette.xml
+share/gnome/help/aisleriot/fr/straight_up.xml
+share/gnome/help/aisleriot/fr/streets_and_alleys.xml
+share/gnome/help/aisleriot/fr/ten_across.xml
+share/gnome/help/aisleriot/fr/thieves.xml
+share/gnome/help/aisleriot/fr/thirteen.xml
+share/gnome/help/aisleriot/fr/thumb_and_pouch.xml
+share/gnome/help/aisleriot/fr/treize.xml
+share/gnome/help/aisleriot/fr/union_square.xml
+share/gnome/help/aisleriot/fr/valentine.xml
+share/gnome/help/aisleriot/fr/westhaven.xml
+share/gnome/help/aisleriot/fr/whitehead.xml
+share/gnome/help/aisleriot/fr/will_o_the_wisp.xml
+share/gnome/help/aisleriot/fr/yield.xml
+share/gnome/help/aisleriot/fr/yukon.xml
+share/gnome/help/aisleriot/fr/zebra.xml
share/gnome/help/blackjack/C/blackjack.xml
share/gnome/help/blackjack/C/figures/blackjack_start_window.png
share/gnome/help/blackjack/C/figures/blackjack_win_window.png
@@ -302,19 +401,17 @@ share/gnome/help/mahjongg/C/figures/mahjongg.png
share/gnome/help/mahjongg/C/figures/no-match.png
share/gnome/help/mahjongg/C/figures/no-move.png
share/gnome/help/mahjongg/C/figures/preferences.png
-share/gnome/help/mahjongg/C/figures/seed.png
share/gnome/help/mahjongg/C/figures/toolbar.png
share/gnome/help/mahjongg/C/legal.xml
share/gnome/help/mahjongg/C/mahjongg.xml
-share/gnome/help/same-gnome/C/figures/blink-sync.png
-share/gnome/help/same-gnome/C/figures/preferences.png
-share/gnome/help/same-gnome/C/figures/same-main-window.png
-share/gnome/help/same-gnome/C/figures/same-planets-fig.png
+share/gnome/help/same-gnome/C/figures/play.png
+share/gnome/help/same-gnome/C/figures/start-up.png
share/gnome/help/same-gnome/C/legal.xml
share/gnome/help/same-gnome/C/same-gnome.xml
share/gnome/mime-info/gnome-stones.keys
share/gnome/mime-info/gnome-stones.mime
share/gnome/omf/gnome-games/aisleriot-C.omf
+share/gnome/omf/gnome-games/aisleriot-fr.omf
share/gnome/omf/gnome-games/blackjack-C.omf
share/gnome/omf/gnome-games/gataxx-C.omf
share/gnome/omf/gnome-games/glines-C.omf
@@ -341,7 +438,7 @@ share/gnome/pixmaps/blackjack/chip-100.svg
share/gnome/pixmaps/blackjack/chip-25.svg
share/gnome/pixmaps/blackjack/chip-5.svg
share/gnome/pixmaps/cards/baize.png
-share/gnome/pixmaps/cards/slot.png
+share/gnome/pixmaps/cards/slot.svg
share/gnome/pixmaps/cards/slots/white-outline.svg
share/gnome/pixmaps/gataxx.png
share/gnome/pixmaps/glines.png
@@ -391,11 +488,11 @@ share/gnome/pixmaps/gnobots2/gnomes.png
share/gnome/pixmaps/gnobots2/robots.png
share/gnome/pixmaps/gnobots2/splat.png
share/gnome/pixmaps/gnobots2/yahoo.png
-share/gnome/pixmaps/gnome-games-common/cards/bonded.png
-share/gnome/pixmaps/gnome-games-common/cards/paris.svg
share/gnome/pixmaps/gnome-aisleriot.png
share/gnome/pixmaps/gnome-blackjack.png
share/gnome/pixmaps/gnome-cardgame.png
+share/gnome/pixmaps/gnome-games-common/cards/bonded.png
+share/gnome/pixmaps/gnome-games-common/cards/paris.svg
share/gnome/pixmaps/gnome-gnobots2.png
share/gnome/pixmaps/gnome-gnomine.png
share/gnome/pixmaps/gnome-gnotravex.png
@@ -434,7 +531,7 @@ share/gnome/pixmaps/gnomine/flag-question.svg
share/gnome/pixmaps/gnomine/flag.svg
share/gnome/pixmaps/gnomine/mine.svg
share/gnome/pixmaps/gnotski-icon.png
-share/gnome/pixmaps/gnotski.png
+share/gnome/pixmaps/gnotski.svg
share/gnome/pixmaps/gtali/gnome-dice-1.svg
share/gnome/pixmaps/gtali/gnome-dice-2.svg
share/gnome/pixmaps/gtali/gnome-dice-3.svg
@@ -448,8 +545,6 @@ share/gnome/pixmaps/iagno/woodtrim.png
share/gnome/pixmaps/mahjongg/postmodern.svg
share/gnome/pixmaps/mahjongg/smooth.png
share/gnome/pixmaps/rteleport.png
-share/gnome/pixmaps/same-gnome/planets.png
-share/gnome/pixmaps/same-gnome/stones.png
share/gnome/pixmaps/teleport.png
share/gnome/sol-games/agnes.scm
share/gnome/sol-games/auld_lang_syne.scm
@@ -616,7 +711,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/sounds/gnibbles
@dirrm share/gnome/sol-games/glade
@dirrm share/gnome/sol-games
-@dirrm share/gnome/pixmaps/same-gnome
@dirrm share/gnome/pixmaps/mahjongg
@dirrm share/gnome/pixmaps/iagno
@dirrm share/gnome/pixmaps/gtali
@@ -681,10 +775,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/help/blackjack/C/figures
@dirrm share/gnome/help/blackjack/C
@dirrm share/gnome/help/blackjack
+@dirrm share/gnome/help/aisleriot/fr/figures
+@dirrm share/gnome/help/aisleriot/fr
@dirrm share/gnome/help/aisleriot/C/figures
@dirrm share/gnome/help/aisleriot/C
@dirrm share/gnome/help/aisleriot
@dirrm share/gnome/gnome-stones
+@dirrm share/gnome/gnome-games/same-gnome/themes/2.10
+@dirrm share/gnome/gnome-games/same-gnome/themes
+@dirrm share/gnome/gnome-games/same-gnome
+@dirrm share/gnome/gnome-games/mahjongg/maps
+@dirrm share/gnome/gnome-games/mahjongg
+@dirrm share/gnome/gnome-games
@dirrm share/gnome/gnobots2
@dirrm share/gnome/gnibbles
@dirrm share/gnome/gnect
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index ffe019d9203e..e62f13025254 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= eog
-PORTVERSION= 2.8.2
-PORTREVISION= 1
+PORTVERSION= 2.9.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.9
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -19,7 +18,7 @@ COMMENT= The Eye Of Gnome image viewer
USE_BZIP2= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libgnomeprintui \
+USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui \
librsvg2 desktopfileutils libgnomeui
USE_X_PREFIX= yes
INSTALLS_OMF= yes
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index 224d1571117e..99853195931e 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/eog-2.8.2.tar.bz2) = 1edf5f0e48fe17468c2d67c56e14c437
-SIZE (gnome2/eog-2.8.2.tar.bz2) = 849212
+MD5 (gnome2/eog-2.9.0.tar.bz2) = be4c2b1dcb1457069d03bf282fccf54b
+SIZE (gnome2/eog-2.9.0.tar.bz2) = 843143
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 61b80e5a1daa..52a7dd9f2196 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -1,8 +1,8 @@
bin/eog
share/gnome/applications/eog.desktop
@exec update-desktop-database > /dev/null || /usr/bin/true
+share/gnome/eog/eog-gtk-ui.xml
share/gnome/eog/glade/eog.glade
-share/gnome/gnome-2.0/ui/eog-gtk-ui.xml
share/gnome/help/eog/C/eog.xml
share/gnome/help/eog/C/figures/eog_save_as_window.png
share/gnome/help/eog/C/figures/eog_start_window.png
@@ -128,9 +128,6 @@ share/locale/vi/LC_MESSAGES/eog.mo
share/locale/wa/LC_MESSAGES/eog.mo
share/locale/zh_CN/LC_MESSAGES/eog.mo
share/locale/zh_TW/LC_MESSAGES/eog.mo
-share/locale/zu/LC_MESSAGES/eog.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
@dirrm share/gnome/pixmaps/eog
@dirrm share/gnome/omf/eog
@dirrm share/gnome/help/eog/zh_TW/figures
@@ -158,6 +155,4 @@ share/locale/zu/LC_MESSAGES/eog.mo
@dirrm share/gnome/help/eog
@dirrm share/gnome/eog/glade
@dirrm share/gnome/eog
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
@unexec update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile
index 27f483028ba2..f9a9e248b18e 100644
--- a/graphics/gpdf/Makefile
+++ b/graphics/gpdf/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gpdf
-PORTVERSION= 2.8.3
-PORTREVISION= 1
+PORTVERSION= 2.10.0
CATEGORIES= graphics print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -29,6 +28,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= gpdf.schemas
post-install:
- @-update-desktop-database > /dev/null
+ @-update-desktop-database
.include <bsd.port.mk>
diff --git a/graphics/gpdf/distinfo b/graphics/gpdf/distinfo
index 7c747257c1e0..9eb8b6dfa555 100644
--- a/graphics/gpdf/distinfo
+++ b/graphics/gpdf/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gpdf-2.8.3.tar.bz2) = c12d3cbf57611286ab80ee4febe2afdd
-SIZE (gnome2/gpdf-2.8.3.tar.bz2) = 1055393
+MD5 (gnome2/gpdf-2.10.0.tar.bz2) = 9278cd3b9d06e3b1d364452f0e512fa9
+SIZE (gnome2/gpdf-2.10.0.tar.bz2) = 1079944
diff --git a/graphics/gpdf/pkg-plist b/graphics/gpdf/pkg-plist
index b5c1ad62aaa7..0a67e02da255 100644
--- a/graphics/gpdf/pkg-plist
+++ b/graphics/gpdf/pkg-plist
@@ -46,6 +46,7 @@ share/locale/en_CA/LC_MESSAGES/gpdf.mo
share/locale/en_GB/LC_MESSAGES/gpdf.mo
share/locale/eo/LC_MESSAGES/gpdf.mo
share/locale/es/LC_MESSAGES/gpdf.mo
+share/locale/et/LC_MESSAGES/gpdf.mo
share/locale/eu/LC_MESSAGES/gpdf.mo
share/locale/fa/LC_MESSAGES/gpdf.mo
share/locale/fi/LC_MESSAGES/gpdf.mo
@@ -70,6 +71,7 @@ share/locale/ml/LC_MESSAGES/gpdf.mo
share/locale/mn/LC_MESSAGES/gpdf.mo
share/locale/ms/LC_MESSAGES/gpdf.mo
share/locale/nb/LC_MESSAGES/gpdf.mo
+share/locale/ne/LC_MESSAGES/gpdf.mo
share/locale/nl/LC_MESSAGES/gpdf.mo
share/locale/nn/LC_MESSAGES/gpdf.mo
share/locale/no/LC_MESSAGES/gpdf.mo
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index a7c0c549d1e2..a1f2ab8690c5 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libgnomecanvas
-PORTVERSION= 2.8.0
+PORTVERSION= 2.10.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index ddc4ebce2feb..4743842c100f 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomecanvas-2.8.0.tar.bz2) = 2bf10396a92777e7b64b6052a8a232f1
-SIZE (gnome2/libgnomecanvas-2.8.0.tar.bz2) = 578849
+MD5 (gnome2/libgnomecanvas-2.10.0.tar.bz2) = 88aac06c8dfd24671db3fe3bf881b5fc
+SIZE (gnome2/libgnomecanvas-2.10.0.tar.bz2) = 575503
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index 642eafb250db..5e48d93c6b44 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -15,36 +15,37 @@ include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h
lib/libglade/2.0/libcanvas.so
lib/libgnomecanvas-2.a
lib/libgnomecanvas-2.so
-lib/libgnomecanvas-2.so.800
+lib/libgnomecanvas-2.so.1000
libdata/pkgconfig/libgnomecanvas-2.0.pc
-share/doc/libgnomecanvas/GnomeCanvas.html
-share/doc/libgnomecanvas/GnomeCanvasBpath.html
-share/doc/libgnomecanvas/GnomeCanvasClipgroup.html
-share/doc/libgnomecanvas/GnomeCanvasEllipse.html
-share/doc/libgnomecanvas/GnomeCanvasGroup.html
-share/doc/libgnomecanvas/GnomeCanvasItem.html
-share/doc/libgnomecanvas/GnomeCanvasLine.html
-share/doc/libgnomecanvas/GnomeCanvasPixbuf.html
-share/doc/libgnomecanvas/GnomeCanvasPolygon.html
-share/doc/libgnomecanvas/GnomeCanvasRE.html
-share/doc/libgnomecanvas/GnomeCanvasRect.html
-share/doc/libgnomecanvas/GnomeCanvasRichText.html
-share/doc/libgnomecanvas/GnomeCanvasShape.html
-share/doc/libgnomecanvas/GnomeCanvasText.html
-share/doc/libgnomecanvas/GnomeCanvasWidget.html
-share/doc/libgnomecanvas/ch01.html
-share/doc/libgnomecanvas/ch02.html
-share/doc/libgnomecanvas/home.png
-share/doc/libgnomecanvas/index.html
-share/doc/libgnomecanvas/index.sgml
-share/doc/libgnomecanvas/left.png
-share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html
-share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html
-share/doc/libgnomecanvas/libgnomecanvas.devhelp
-share/doc/libgnomecanvas/right.png
-share/doc/libgnomecanvas/style.css
-share/doc/libgnomecanvas/up.png
+%%DOCSDIR%%/GnomeCanvas.html
+%%DOCSDIR%%/GnomeCanvasBpath.html
+%%DOCSDIR%%/GnomeCanvasClipgroup.html
+%%DOCSDIR%%/GnomeCanvasEllipse.html
+%%DOCSDIR%%/GnomeCanvasGroup.html
+%%DOCSDIR%%/GnomeCanvasItem.html
+%%DOCSDIR%%/GnomeCanvasLine.html
+%%DOCSDIR%%/GnomeCanvasPixbuf.html
+%%DOCSDIR%%/GnomeCanvasPolygon.html
+%%DOCSDIR%%/GnomeCanvasRE.html
+%%DOCSDIR%%/GnomeCanvasRect.html
+%%DOCSDIR%%/GnomeCanvasRichText.html
+%%DOCSDIR%%/GnomeCanvasShape.html
+%%DOCSDIR%%/GnomeCanvasText.html
+%%DOCSDIR%%/GnomeCanvasWidget.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libgnomecanvas-gnome-canvas-path-def.html
+%%DOCSDIR%%/libgnomecanvas-gnome-canvas-util.html
+%%DOCSDIR%%/libgnomecanvas.devhelp
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/ang/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/be/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -108,10 +109,15 @@ share/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/uk/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/vi/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/wa/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/xh/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/yi/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo
-@dirrm share/doc/libgnomecanvas
+@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh 2> /dev/null || true
+@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ang 2> /dev/null || true
+@dirrm %%DOCSDIR%%
@dirrm lib/libglade/2.0
@dirrm lib/libglade
@dirrm include/libgnomecanvas-2.0/libgnomecanvas
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index b936beb8cb5b..d13ef9beb3cd 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= librsvg2
-PORTVERSION= 2.8.1
+PORTVERSION= 2.9.5
PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.9
DISTNAME= librsvg-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -29,13 +29,13 @@ USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL_VER=15
USE_REINPLACE= yes
-USE_GNOME= gnomehack gnomeprefix libartlgpl2 libgsf gnomevfs2
+WANT_GNOME= yes
+USE_GNOME= gnomehack gnomeprefix libartlgpl2 libgsf gtk20
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-svgz \
--disable-gtk-doc \
--without-gimp \
- --enable-gnome-vfs \
--with-croco
CROCO_VERSION= 0.6
@@ -47,8 +47,20 @@ MAN1= rsvg.1
OPTIONS= MOZILLA_PLUGIN "Enable the RSVG browser plug-in" no
+.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.undef WITHOUT_GNOME
+WITH_GNOME= yes
+.endif
+
.include <bsd.port.pre.mk>
+.if ${HAVE_GNOME:Mgnomevfs2}!=""
+USE_GNOME+= gnomevfs2
+CONFIGURE_ARGS+=--enable-gnome-vfs
+.else
+CONFIGURE_ARGS+=--disable-gnome-vfs
+.endif
+
.if defined(WITH_MOZILLA_PLUGIN)
.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
@@ -81,6 +93,14 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile.in
PLIST_SUB+= PLUGIN="@comment "
.endif
+.if ${OSVERSION} < 500000
+.if defined(WITH_MOZILLA)
+.if ${WITH_MOZILLA}=="mozilla-devel"
+USE_GCC= 3.4
+.endif
+.endif
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
${WRKSRC}/librsvg-2.0.pc.in
@@ -93,6 +113,9 @@ post-patch:
.endif
.endif
+pre-build:
+ @${REINPLACE_CMD} -E -e 's|O2|O|g' ${WRKSRC}/Makefile
+
.if defined(WITH_MOZILLA_PLUGIN)
post-install:
${MKDIR} ${PREFIX}/lib/browser_plugins
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 567866d8a371..40f8c84a55e4 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/librsvg-2.8.1.tar.bz2) = 01c14f6adcf3a71be2b808879e1223a0
-SIZE (gnome2/librsvg-2.8.1.tar.bz2) = 361446
+MD5 (gnome2/librsvg-2.9.5.tar.bz2) = 44799d75e940eb4150acdae4f63cbe2a
+SIZE (gnome2/librsvg-2.9.5.tar.bz2) = 392785
diff --git a/graphics/librsvg2/files/extra-patch-Makefile.in b/graphics/librsvg2/files/extra-patch-Makefile.in
index 27c8fcd2988f..6bcb7ef6882e 100644
--- a/graphics/librsvg2/files/extra-patch-Makefile.in
+++ b/graphics/librsvg2/files/extra-patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig Fri Sep 3 00:54:51 2004
-+++ Makefile.in Fri Sep 3 00:55:00 2004
-@@ -307,7 +307,7 @@
+--- Makefile.in.orig Wed Jan 26 04:47:10 2005
++++ Makefile.in Wed Jan 26 04:47:24 2005
+@@ -199,7 +199,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = . gtk-engine gdk-pixbuf-loader moz-plugin doc data
+SUBDIRS = . gtk-engine gdk-pixbuf-loader doc data
- @HAVE_GTK_FALSE@target_rsvg_view =
+
@HAVE_GTK_TRUE@target_rsvg_view = rsvg-view
- man_MANS = rsvg.1
+ @HAVE_GTK_FALSE@target_rsvg_view =
diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
index 1f570b2472c2..97a0a3fd20e0 100644
--- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
+++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
@@ -1,25 +1,25 @@
---- moz-plugin/Makefile.in.orig Fri Sep 3 01:07:24 2004
-+++ moz-plugin/Makefile.in Fri Sep 3 01:08:00 2004
-@@ -282,15 +282,15 @@
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+--- moz-plugin/Makefile.in.orig Tue Jan 25 23:31:56 2005
++++ moz-plugin/Makefile.in Tue Jan 25 23:32:32 2005
+@@ -252,15 +252,15 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-- test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
+- $(mkinstalldirs) $(DESTDIR)$(plugindir)
- @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
+- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
+- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
- else :; fi; \
- done
+# @$(NORMAL_INSTALL)
-+# test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
++# $(mkinstalldirs) $(DESTDIR)$(plugindir)
+# @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+# if test -f $$p; then \
+# f="`echo $$p | sed -e 's|^.*/||'`"; \
-+# echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
-+# $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
++# echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
++# $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
+# else :; fi; \
+# done
diff --git a/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c b/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c
deleted file mode 100644
index f75959a2a4ef..000000000000
--- a/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- moz-plugin/moz-plugin.c.orig Fri Sep 3 00:48:45 2004
-+++ moz-plugin/moz-plugin.c Fri Sep 3 00:49:35 2004
-@@ -26,9 +26,12 @@
- #include <config.h>
-
- #include <stdio.h>
-+#ifdef HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- #include <unistd.h>
- #include <sys/wait.h>
-+#include <signal.h>
-
- #include <X11/Xlib.h>
- #include <X11/Intrinsic.h>
diff --git a/graphics/librsvg2/files/patch-rsvg-paint-server.c b/graphics/librsvg2/files/patch-rsvg-paint-server.c
new file mode 100644
index 000000000000..f6e05c030dc4
--- /dev/null
+++ b/graphics/librsvg2/files/patch-rsvg-paint-server.c
@@ -0,0 +1,14 @@
+--- rsvg-paint-server.c.orig Tue Jan 25 23:39:10 2005
++++ rsvg-paint-server.c Tue Jan 25 23:39:19 2005
+@@ -84,10 +84,10 @@
+ const RsvgPSCtx *ctx)
+ {
+ RsvgPaintServerSolid *z = (RsvgPaintServerSolid *)self;
++ ArtPixMaxDepth color[3];
+ guint32 rgb = z->rgb;
+ if (z->currentcolour)
+ rgb = rsvg_state_current(ctx->ctx)->current_color;
+- ArtPixMaxDepth color[3];
+
+ color[0] = ART_PIX_MAX_FROM_8 (rgb >> 16);
+ color[1] = ART_PIX_MAX_FROM_8 ((rgb >> 8) & 0xff);
diff --git a/graphics/librsvg2/files/patch-rsvg-shapes.c b/graphics/librsvg2/files/patch-rsvg-shapes.c
new file mode 100644
index 000000000000..2642a2539b36
--- /dev/null
+++ b/graphics/librsvg2/files/patch-rsvg-shapes.c
@@ -0,0 +1,14 @@
+--- rsvg-shapes.c.orig Tue Jan 25 23:43:50 2005
++++ rsvg-shapes.c Tue Jan 25 23:44:01 2005
+@@ -2579,10 +2579,10 @@
+ const char * id, *value;
+ double vbox_x = 0, vbox_y = 0, vbox_w = 0, vbox_h = 0;
+ gboolean has_vbox = FALSE, overflow = 0;
+- id = NULL;
+ RsvgDefsDrawableSvg * svg;
+ RsvgDefsDrawableGroup * group;
+ RsvgState state;
++ id = NULL;
+ rsvg_state_init(&state);
+
+ if (rsvg_property_bag_size (atts))
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index ef193121ef5f..5604203a5e03 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -1,5 +1,6 @@
bin/rsvg
bin/rsvg-view
+include/librsvg-2/librsvg/librsvg-enum-types.h
include/librsvg-2/librsvg/librsvg-features.h
include/librsvg-2/librsvg/rsvg-gz.h
include/librsvg-2/librsvg/rsvg.h
@@ -8,7 +9,7 @@ lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.so
lib/librsvg-2.a
lib/librsvg-2.so
-lib/librsvg-2.so.10
+lib/librsvg-2.so.11
libdata/pkgconfig/librsvg-2.0.pc
share/doc/librsvg/html/home.png
share/doc/librsvg/html/index.html
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index f8f815e4531a..90ba22ac5525 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= ximian
-PORTVERSION= 2.0.4
+PORTVERSION= 2.2.0
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/2.0
+MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/2.2
PKGNAMESUFFIX= -connector
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
@@ -26,13 +26,13 @@ USE_GMAKE= yes
USE_OPENLDAP= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnometarget
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -rpath ${X11BASE}/lib/evolution/${EVO_VERSION}"
+ LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \
--with-static-ldap=no
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-EVO_VERSION= 2.0
-PLIST_SUB= VERSION="2.0" EVO_VERSION=${EVO_VERSION}
+EVO_VERSION= 2.2
+PLIST_SUB= VERSION="2.2" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2"
.include <bsd.port.pre.mk>
@@ -48,4 +48,8 @@ CONFIGURE_ARGS+= --with-krb5=${LOCALBASE}
.endif
.endif
+.if ${ARCH} == "amd64"
+CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
+.endif
+
.include <bsd.port.post.mk>
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index 0bca663c9c31..bf1166cc4bf2 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,2 +1,2 @@
-MD5 (ximian-connector-2.0.4.tar.bz2) = 726499c226b0932882dffe76869e9031<