aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2010-07-25 19:35:08 +0000
committerKoop Mast <kwm@FreeBSD.org>2010-07-25 19:35:08 +0000
commit65898b3f67b3d8e8a17dca6914405aded77c8962 (patch)
treee78e9c70bc1a3c88055a240791ca22ed62d1f879
parent90a918f71bfcf23b3df4225f711a4644a2519b63 (diff)
downloadports-65898b3f67b3d8e8a17dca6914405aded77c8962.tar.gz
ports-65898b3f67b3d8e8a17dca6914405aded77c8962.zip
Notes
-rw-r--r--accessibility/mousetweaks/Makefile5
-rw-r--r--accessibility/mousetweaks/distinfo6
-rw-r--r--accessibility/orca/Makefile5
-rw-r--r--accessibility/orca/distinfo6
-rw-r--r--archivers/file-roller/Makefile5
-rw-r--r--archivers/file-roller/distinfo6
-rw-r--r--audio/libcanberra/Makefile7
-rw-r--r--audio/libcanberra/distinfo6
-rw-r--r--audio/libcanberra/files/patch-configure15
-rw-r--r--databases/evolution-data-server/Makefile9
-rw-r--r--databases/evolution-data-server/distinfo6
-rw-r--r--databases/libgda4/Makefile4
-rw-r--r--databases/libgda4/distinfo6
-rw-r--r--databases/libgda4/files/patch-configure14
-rw-r--r--databases/libgda4/files/patch-libgda_Makefile.in12
-rw-r--r--deskutils/gucharmap/Makefile5
-rw-r--r--deskutils/gucharmap/distinfo6
-rw-r--r--deskutils/hamster-applet/Makefile6
-rw-r--r--deskutils/hamster-applet/distinfo6
-rw-r--r--devel/anjuta/Makefile4
-rw-r--r--devel/anjuta/distinfo6
-rw-r--r--devel/devhelp/Makefile5
-rw-r--r--devel/devhelp/distinfo6
-rw-r--r--devel/devhelp/pkg-plist8
-rw-r--r--devel/gconfmm26/Makefile11
-rw-r--r--devel/gconfmm26/distinfo6
-rw-r--r--devel/gconfmm26/pkg-plist4
-rw-r--r--devel/gvfs/Makefile5
-rw-r--r--devel/gvfs/distinfo6
-rw-r--r--devel/gvfs/pkg-plist3
-rw-r--r--devel/libsigc++20/Makefile4
-rw-r--r--devel/libsigc++20/distinfo6
-rw-r--r--devel/libsoup/Makefile8
-rw-r--r--devel/libsoup/distinfo6
-rw-r--r--editors/gedit/Makefile5
-rw-r--r--editors/gedit/distinfo6
-rw-r--r--games/gnome-games/Makefile7
-rw-r--r--games/gnome-games/distinfo6
-rw-r--r--games/gnome-games/pkg-plist23
-rw-r--r--graphics/clutter/Makefile4
-rw-r--r--graphics/clutter/distinfo6
-rw-r--r--graphics/clutter/files/patch-clutter_glx_clutter-stage-glx.c12
-rw-r--r--graphics/eog-plugins/Makefile5
-rw-r--r--graphics/eog-plugins/distinfo6
-rw-r--r--graphics/eog-plugins/pkg-plist2
-rw-r--r--graphics/eog/Makefile5
-rw-r--r--graphics/eog/distinfo6
-rw-r--r--graphics/eog/pkg-plist7
-rw-r--r--graphics/evince/Makefile8
-rw-r--r--graphics/evince/distinfo6
-rw-r--r--graphics/evince/files/patch-shell_ev-window.c11
-rw-r--r--graphics/poppler-data/Makefile3
-rw-r--r--graphics/poppler-data/distinfo6
-rw-r--r--mail/evolution-exchange/Makefile5
-rw-r--r--mail/evolution-exchange/distinfo6
-rw-r--r--mail/evolution-mapi/Makefile5
-rw-r--r--mail/evolution-mapi/distinfo6
-rw-r--r--mail/evolution/Makefile5
-rw-r--r--mail/evolution/distinfo6
-rw-r--r--mail/evolution/pkg-plist9
-rw-r--r--math/gcalctool/Makefile5
-rw-r--r--math/gcalctool/distinfo6
-rw-r--r--net-im/empathy/Makefile4
-rw-r--r--net-im/empathy/distinfo6
-rw-r--r--net/libgweather/Makefile5
-rw-r--r--net/libgweather/distinfo6
-rw-r--r--net/libgweather/pkg-plist7
-rw-r--r--net/vinagre/Makefile8
-rw-r--r--net/vinagre/distinfo6
-rw-r--r--ports-mgmt/gnome-packagekit/Makefile5
-rw-r--r--ports-mgmt/gnome-packagekit/distinfo6
-rw-r--r--ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus.c59
-rw-r--r--ports-mgmt/gnome-packagekit/pkg-plist7
-rw-r--r--security/gnome-keyring/Makefile11
-rw-r--r--security/gnome-keyring/distinfo6
-rw-r--r--security/gnome-keyring/files/org.freedesktop.secrets.service.in3
-rw-r--r--security/gnome-keyring/files/patch-daemon_Makefile.in11
-rw-r--r--sysutils/brasero/Makefile5
-rw-r--r--sysutils/brasero/distinfo6
-rw-r--r--sysutils/brasero/pkg-plist6
-rw-r--r--sysutils/gnome-settings-daemon/Makefile5
-rw-r--r--sysutils/gnome-settings-daemon/distinfo6
-rw-r--r--sysutils/gnome-system-tools/Makefile5
-rw-r--r--sysutils/gnome-system-tools/distinfo6
-rw-r--r--sysutils/pessulus/Makefile5
-rw-r--r--sysutils/pessulus/distinfo6
-rw-r--r--sysutils/pessulus/pkg-plist7
-rw-r--r--sysutils/upower/Makefile7
-rw-r--r--sysutils/upower/distinfo6
-rw-r--r--sysutils/upower/files/patch-src_freebsd_up-backend.c19
-rw-r--r--textproc/gtk-doc/Makefile4
-rw-r--r--textproc/gtk-doc/distinfo6
-rw-r--r--www/gtkhtml3/Makefile5
-rw-r--r--www/gtkhtml3/distinfo6
-rw-r--r--x11-themes/gnome-themes/Makefile5
-rw-r--r--x11-themes/gnome-themes/distinfo6
-rw-r--r--x11-themes/gnome-themes/pkg-plist22
-rw-r--r--x11-toolkits/gtksourceview2/Makefile4
-rw-r--r--x11-toolkits/gtksourceview2/distinfo6
-rw-r--r--x11-toolkits/libgail-gnome/Makefile5
-rw-r--r--x11-toolkits/libgail-gnome/distinfo6
-rw-r--r--x11-toolkits/libwnck/Makefile6
-rw-r--r--x11-toolkits/libwnck/distinfo6
-rw-r--r--x11-toolkits/libwnck/pkg-plist1
-rw-r--r--x11-toolkits/pango/Makefile6
-rw-r--r--x11-toolkits/pango/distinfo6
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile8
-rw-r--r--x11-toolkits/py-gnome-desktop/distinfo6
-rw-r--r--x11/gdm/Makefile5
-rw-r--r--x11/gdm/distinfo6
-rw-r--r--x11/gdm/files/gdm.in2
-rw-r--r--x11/gdm/files/gdm.pam.in2
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c41
-rw-r--r--x11/gdm/pkg-install4
-rw-r--r--x11/gdm/pkg-plist3
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-desktop/distinfo6
-rw-r--r--x11/gnome-menus/Makefile5
-rw-r--r--x11/gnome-menus/distinfo6
-rw-r--r--x11/gnome-menus/pkg-plist3
-rw-r--r--x11/gnome-panel/Makefile6
-rw-r--r--x11/gnome-panel/distinfo6
-rw-r--r--x11/gnome-session/Makefile8
-rw-r--r--x11/gnome-session/distinfo6
-rw-r--r--x11/gnome-terminal/Makefile9
-rw-r--r--x11/gnome-terminal/distinfo6
-rw-r--r--x11/gnome2/Makefile6
-rw-r--r--x11/libgnomekbd/Makefile5
-rw-r--r--x11/libgnomekbd/distinfo6
129 files changed, 502 insertions, 406 deletions
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 5d5fddc18db1..0885e41f31ea 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.46 2010/04/27 14:33:35 kwm Exp $
+# $MCom: ports-stable/accessibility/mousetweaks/Makefile,v 1.1 2010/06/23 12:32:12 kwm Exp $
#
PORTNAME= mousetweaks
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.30.2
CATEGORIES= accessibility
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/mousetweaks/distinfo b/accessibility/mousetweaks/distinfo
index 9761bc77c084..abdc059c6ce9 100644
--- a/accessibility/mousetweaks/distinfo
+++ b/accessibility/mousetweaks/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/mousetweaks-2.30.1.tar.bz2) = ba764f315df090bb5c99474b36ae768d
-SHA256 (gnome2/mousetweaks-2.30.1.tar.bz2) = 6bd16a59b248a68ae0c99e185400eba58c3dac82a99ca2cc7c60e775accd01e6
-SIZE (gnome2/mousetweaks-2.30.1.tar.bz2) = 2195351
+MD5 (gnome2/mousetweaks-2.30.2.tar.bz2) = 35e755f9e607b1e18f9cc619ec496c24
+SHA256 (gnome2/mousetweaks-2.30.2.tar.bz2) = d204e41bba4f14728246dc01b867d59fbc9e809739f0a7e9ad226a95af594da4
+SIZE (gnome2/mousetweaks-2.30.2.tar.bz2) = 2195681
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 330fea3c47d6..36eb4039f6fe 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/orca/Makefile,v 1.84 2010/04/26 10:45:56 kwm Exp $
+# $MCom: ports-stable/accessibility/orca/Makefile,v 1.5 2010/06/23 12:15:30 kwm Exp $
#
PORTNAME= orca
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.30.2
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index c98b383299d0..96a6b5e0758e 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/orca-2.30.1.tar.bz2) = 316e825174c15858ea54cc136536c1f7
-SHA256 (gnome2/orca-2.30.1.tar.bz2) = 0493e0fb7a9b3e65ee0c349751d5295020aa25277a8b0545710317a1add2645b
-SIZE (gnome2/orca-2.30.1.tar.bz2) = 2265634
+MD5 (gnome2/orca-2.30.2.tar.bz2) = 8988f96533109c14cbd5ac8f2b0754f2
+SHA256 (gnome2/orca-2.30.2.tar.bz2) = 0359387f6be84b4321313a3f96deb6b65314e6334b86658a12386976bb82c5df
+SIZE (gnome2/orca-2.30.2.tar.bz2) = 2291523
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 062f9efec65a..14b14d13fb2c 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,12 +3,11 @@
# Whom: Anders Nordby <anders@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/archivers/file-roller/Makefile,v 1.177 2010/04/27 22:36:37 kwm Exp $
+# $MCom: ports-stable/archivers/file-roller/Makefile,v 1.5 2010/06/23 15:16:03 kwm Exp $
#
PORTNAME= file-roller
-PORTVERSION= 2.30.1.1
-PORTREVISION= 1
+PORTVERSION= 2.30.2
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= GNOME
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 2e7379e9d828..686e3829684f 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.30.1.1.tar.bz2) = a29a82396caf8c5726d7f0256e0ba02a
-SHA256 (gnome2/file-roller-2.30.1.1.tar.bz2) = 4a8bf476fa89b52fa2e7bec4c824ebc03136bbcb55ab3694dfe6e1c1aef401b4
-SIZE (gnome2/file-roller-2.30.1.1.tar.bz2) = 1816845
+MD5 (gnome2/file-roller-2.30.2.tar.bz2) = c13209518d2e2294ec1fa813e063b0c5
+SHA256 (gnome2/file-roller-2.30.2.tar.bz2) = 34e809ee4e11d85d314b9060a5641a68e55046d429bf8a435a24b777eec8b2f5
+SIZE (gnome2/file-roller-2.30.2.tar.bz2) = 1818246
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 0233875d5133..32cc02ea57de 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libcanberra
-PORTVERSION= 0.24
-PORTREVISION= 1
+PORTVERSION= 0.25
CATEGORIES= audio devel
MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/
@@ -16,11 +15,13 @@ COMMENT= Implementation of the Freedesktop sound theme spec
LIB_DEPENDS= vorbisfile.6:${PORTSDIR}/audio/libvorbis
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/LGPL
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack gconf2
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22 libltdl:22
-CONFIGURE_ARGS= --disable-lynx --disable-tdb
+CONFIGURE_ARGS= --disable-lynx --disable-tdb --disable-gtk3
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo
index 172ea410a055..6631ad47b89c 100644
--- a/audio/libcanberra/distinfo
+++ b/audio/libcanberra/distinfo
@@ -1,3 +1,3 @@
-MD5 (libcanberra-0.24.tar.gz) = 23de3d11abd4920c6c9560e3a566e04d
-SHA256 (libcanberra-0.24.tar.gz) = 902f075cc9065d042cd4b027ffe7891ea718565f22dbafa43fd9dccfd63a95fa
-SIZE (libcanberra-0.24.tar.gz) = 460860
+MD5 (libcanberra-0.25.tar.gz) = d7a158d22d0b44fb2a67aadae74e28ab
+SHA256 (libcanberra-0.25.tar.gz) = 46329eda4c877206232d4c906e8f5f401518cec52859395cde3a9e39ea97553c
+SIZE (libcanberra-0.25.tar.gz) = 463014
diff --git a/audio/libcanberra/files/patch-configure b/audio/libcanberra/files/patch-configure
new file mode 100644
index 000000000000..c2a0d3cc8b66
--- /dev/null
+++ b/audio/libcanberra/files/patch-configure
@@ -0,0 +1,15 @@
+--- configure.orig 2010-07-14 13:00:51.000000000 +0200
++++ configure 2010-07-14 13:02:26.000000000 +0200
+@@ -3273,12 +3273,6 @@
+ AM_BACKSLASH='\'
+
+
+-if type -p stow > /dev/null && test -d /usr/local/stow ; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***" >&5
+-$as_echo "$as_me: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***" >&6;}
+- ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
+-fi
+-
+ #### Checks for programs. ####
+
+
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 078f78fba953..78b37c26f16d 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/evolution-data-server/Makefile,v 1.194 2010/04/26 13:45:12 kwm Exp $
+# $MCom: ports-stable/databases/evolution-data-server/Makefile,v 1.8 2010/06/24 10:03:53 kwm Exp $
#
PORTNAME= evolution-data-server
-PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTVERSION= 2.30.2.1
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -22,7 +22,7 @@ LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \
nss3.1:${PORTSDIR}/security/nss \
tasn1.4:${PORTSDIR}/security/libtasn1 \
sqlite3.8:${PORTSDIR}/databases/sqlite3 \
- gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
USE_BZIP2= yes
USE_GMAKE= yes
@@ -85,6 +85,7 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \
s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g ; \
+ s|LIBEDATASERVER_CURRENT=13|LIBEDATASERVER_CURRENT=11|g ; \
s|-Wl,--no-undefined||g ; \
s|-Wmissing-include-dirs||g' \
${WRKSRC}/configure
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index cd82fa631e3b..0f557a05b42d 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-2.30.1.tar.bz2) = f177441d6fd4ef8c9a92d5706d290f10
-SHA256 (gnome2/evolution-data-server-2.30.1.tar.bz2) = b2ebeac36931fbee6fb747ee535a61243dd99fa15bc472ca239f2b01cc88795e
-SIZE (gnome2/evolution-data-server-2.30.1.tar.bz2) = 4636784
+MD5 (gnome2/evolution-data-server-2.30.2.1.tar.bz2) = 826d85fc6e088156154ae0c543454d7f
+SHA256 (gnome2/evolution-data-server-2.30.2.1.tar.bz2) = 17fa6d42957a0b7b1c3887e6f8d4b78cf69b01fc8afd080788ed2947d1048f23
+SIZE (gnome2/evolution-data-server-2.30.2.1.tar.bz2) = 4645500
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 2ce848039d61..0e2329f62f97 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/libgda4/Makefile,v 1.5 2010/03/14 19:24:27 marcus Exp $
+# $MCom: ports-stable/databases/libgda4/Makefile,v 1.4 2010/06/23 21:29:32 kwm Exp $
#
PORTNAME= libgda4
-PORTVERSION?= 4.0.8
+PORTVERSION?= 4.0.9
PORTREVISION?= 0
CATEGORIES= databases gnome
MASTER_SITES= GNOME
diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo
index eed091dfa0ea..5ba3eb25adc8 100644
--- a/databases/libgda4/distinfo
+++ b/databases/libgda4/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgda-4.0.8.tar.bz2) = 3e4a55f370805cda9ac415211da4aacc
-SHA256 (gnome2/libgda-4.0.8.tar.bz2) = c731cd8015f63a3bff37341cb8ffc4d8086a535d960af098194968ac87555788
-SIZE (gnome2/libgda-4.0.8.tar.bz2) = 8229914
+MD5 (gnome2/libgda-4.0.9.tar.bz2) = de14cf681c0bcfb3a4076a3ddc1508a2
+SHA256 (gnome2/libgda-4.0.9.tar.bz2) = c3e2958cd711177ec4be0a69cd453ab728526fa38592c5539e7d89d3778e9e56
+SIZE (gnome2/libgda-4.0.9.tar.bz2) = 8227552
diff --git a/databases/libgda4/files/patch-configure b/databases/libgda4/files/patch-configure
new file mode 100644
index 000000000000..6e42fcfab8ff
--- /dev/null
+++ b/databases/libgda4/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig 2010-06-23 23:07:54.000000000 +0200
++++ configure 2010-06-23 23:09:57.000000000 +0200
+@@ -18629,9 +18629,9 @@
+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
++ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\${datadir}|"`
+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
++ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\${libdir}|"`
+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/databases/libgda4/files/patch-libgda_Makefile.in b/databases/libgda4/files/patch-libgda_Makefile.in
deleted file mode 100644
index e33d5924a1d5..000000000000
--- a/databases/libgda4/files/patch-libgda_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgda/Makefile.in.orig 2010-03-21 03:57:28.000000000 -0400
-+++ libgda/Makefile.in 2010-03-21 03:58:29.000000000 -0400
-@@ -1349,7 +1349,8 @@ dist-hook:
- @HAVE_INTROSPECTION_TRUE@ --include=GL-1.0 \
- @HAVE_INTROSPECTION_TRUE@ --include=GObject-2.0 \
- @HAVE_INTROSPECTION_TRUE@ --include=libxml2-2.0 \
--@HAVE_INTROSPECTION_TRUE@ --library=gda-@GDA_ABI_VERSION@ \
-+@HAVE_INTROSPECTION_TRUE@ --libtool="$(LIBTOOL)" \
-+@HAVE_INTROSPECTION_TRUE@ --library=libgda-@GDA_ABI_VERSION@.la \
- @HAVE_INTROSPECTION_TRUE@ $(INCLUDE_CFLAGS) \
- @HAVE_INTROSPECTION_TRUE@ --output $@ \
- @HAVE_INTROSPECTION_TRUE@ $(addprefix $(srcdir)/, $(gda_headers)) \
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index be9416801144..c0ad32418d61 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gucharmap/Makefile,v 1.70 2010/04/26 22:29:26 kwm Exp $
+# $MCom: ports-stable/deskutils/gucharmap/Makefile,v 1.1 2010/06/23 15:10:44 kwm Exp $
#
PORTNAME= gucharmap
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.30.2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index c05093c957f2..6cfde61c1d2d 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gucharmap-2.30.1.tar.bz2) = cd3b342fb75b4bd9df2327c247aa457b
-SHA256 (gnome2/gucharmap-2.30.1.tar.bz2) = 016c5158c67eeb43e2f8a3bdfa32341beb039f7ef917f912f0ae56ee5bfe60f9
-SIZE (gnome2/gucharmap-2.30.1.tar.bz2) = 3101481
+MD5 (gnome2/gucharmap-2.30.2.tar.bz2) = f997f6e6ba970fef7ec704da06e2de80
+SHA256 (gnome2/gucharmap-2.30.2.tar.bz2) = eab5e6e1ef244e14173a491fb2b42724d68e1aa5ca179cabd7f1b691209a7849
+SIZE (gnome2/gucharmap-2.30.2.tar.bz2) = 3102073
diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index f621150d632c..428c23ef1eed 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/hamster-applet/Makefile,v 1.40 2010/04/27 14:26:32 kwm Exp $
+# $MCom: ports-stable/deskutils/hamster-applet/Makefile,v 1.2 2010/06/24 21:30:14 mezz Exp $
#
PORTNAME= hamster-applet
-PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTVERSION= 2.30.2
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/hamster-applet/distinfo b/deskutils/hamster-applet/distinfo
index 66ca9c86cd8f..72544ff3382d 100644
--- a/deskutils/hamster-applet/distinfo
+++ b/deskutils/hamster-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/hamster-applet-2.30.1.tar.bz2) = 4f1ae4223344bb1c209676c2d31665e2
-SHA256 (gnome2/hamster-applet-2.30.1.tar.bz2) = a21994de512e17b176ff802c162dc1d26b25d8908c6108d47cd3c5c283fe4b3c
-SIZE (gnome2/hamster-applet-2.30.1.tar.bz2) = 600397
+MD5 (gnome2/hamster-applet-2.30.2.tar.bz2) = ad662fd81a09c5a0e19d1aa733e78588
+SHA256 (gnome2/hamster-applet-2.30.2.tar.bz2) = fd12c77acffc56fea8c3de46dcce0b31ab6856230fe49f547c4c74f70addc5e3
+SIZE (gnome2/hamster-applet-2.30.2.tar.bz2) = 614083
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 3ab8535522ca..c7c451df9dd2 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -3,11 +3,11 @@
# Whom: Dmitry Sivachenko <demon@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/anjuta/Makefile,v 1.58 2010/04/28 08:11:36 kwm Exp $
+# $MCom: ports-stable/devel/anjuta/Makefile,v 1.8 2010/06/23 19:53:50 kwm Exp $
#
PORTNAME= anjuta
-PORTVERSION= 2.30.2.0
+PORTVERSION= 2.30.2.1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index d53160ba56b1..895950f1e557 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/anjuta-2.30.2.0.tar.bz2) = 7d45d661d639fbbfa41d9a4f980cc559
-SHA256 (gnome2/anjuta-2.30.2.0.tar.bz2) = a281fe303fce08026407b24e8a676f4458031bc6dd6b2799c028494d22dcd34b
-SIZE (gnome2/anjuta-2.30.2.0.tar.bz2) = 9410951
+MD5 (gnome2/anjuta-2.30.2.1.tar.bz2) = 9b511224d97500ac9b318588fbb441ab
+SHA256 (gnome2/anjuta-2.30.2.1.tar.bz2) = ea32910ed047300934b6fe27a363b3dd57047222f8b664ff6dcb767a2fcd2726
+SIZE (gnome2/anjuta-2.30.2.1.tar.bz2) = 9405637
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index d16cec699dce..26465d7be7ef 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -3,11 +3,10 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/devhelp/Makefile,v 1.32 2010/03/30 15:51:07 avl Exp $
+# $MCom: ports-stable/devel/devhelp/Makefile,v 1.1 2010/06/23 12:12:25 kwm Exp $
PORTNAME= devhelp
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.30.1
PORTEPOCH= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo
index 2603e5a1a97c..00752246c60c 100644
--- a/devel/devhelp/distinfo
+++ b/devel/devhelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/devhelp-2.30.0.tar.bz2) = a24087cd1b4fe6722ec05f6e88104ace
-SHA256 (gnome2/devhelp-2.30.0.tar.bz2) = 4e40dac8d8e5008fd7fe4113688d3ae9031eace7f0e10857a3bbbf103d875953
-SIZE (gnome2/devhelp-2.30.0.tar.bz2) = 484771
+MD5 (gnome2/devhelp-2.30.1.tar.bz2) = 447413a54d3bec2480e9a290e261703d
+SHA256 (gnome2/devhelp-2.30.1.tar.bz2) = a72d75fae489bc957f15ef203a6bf8fc9cf80f2730444912dc568476018d5335
+SIZE (gnome2/devhelp-2.30.1.tar.bz2) = 489222
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index 12e1413725ea..963290b7ae3f 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -52,6 +52,7 @@ share/locale/el/LC_MESSAGES/devhelp.mo
share/locale/en_CA/LC_MESSAGES/devhelp.mo
share/locale/en_GB/LC_MESSAGES/devhelp.mo
share/locale/en@shaw/LC_MESSAGES/devhelp.mo
+share/locale/eo/LC_MESSAGES/devhelp.mo
share/locale/es/LC_MESSAGES/devhelp.mo
share/locale/et/LC_MESSAGES/devhelp.mo
share/locale/fi/LC_MESSAGES/devhelp.mo
@@ -62,6 +63,8 @@ share/locale/he/LC_MESSAGES/devhelp.mo
share/locale/hi/LC_MESSAGES/devhelp.mo
share/locale/hr/LC_MESSAGES/devhelp.mo
share/locale/hu/LC_MESSAGES/devhelp.mo
+share/locale/hy/LC_MESSAGES/devhelp.mo
+share/locale/id/LC_MESSAGES/devhelp.mo
share/locale/is/LC_MESSAGES/devhelp.mo
share/locale/it/LC_MESSAGES/devhelp.mo
share/locale/ja/LC_MESSAGES/devhelp.mo
@@ -97,6 +100,7 @@ share/locale/ta/LC_MESSAGES/devhelp.mo
share/locale/te/LC_MESSAGES/devhelp.mo
share/locale/th/LC_MESSAGES/devhelp.mo
share/locale/tr/LC_MESSAGES/devhelp.mo
+share/locale/ug/LC_MESSAGES/devhelp.mo
share/locale/uk/LC_MESSAGES/devhelp.mo
share/locale/vi/LC_MESSAGES/devhelp.mo
share/locale/zh_CN/LC_MESSAGES/devhelp.mo
@@ -111,6 +115,8 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -123,6 +129,8 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
@dirrmtry share/locale/oc
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/eo/LC_MESSAGES
+@dirrmtry share/locale/eo
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 8ebfd04979dc..391c9bcd9e03 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -3,12 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gconfmm26/Makefile,v 1.25 2009/09/22 20:58:48 kwm Exp $
+# $MCom: ports-stable/devel/gconfmm26/Makefile,v 1.1 2010/06/24 07:51:01 kwm Exp $
#
PORTNAME= gconfmm
-PORTVERSION= 2.28.0
-PORTREVISION= 2
+PORTVERSION= 2.28.2
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -25,17 +24,15 @@ LATEST_LINK= gconfmm26
USE_BZIP2= yes
USE_XORG= x11
USE_GMAKE= yes
-USE_GNOME= gnomehack gconf2
+USE_GNOME= gnomehack gconf2 referencehack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --enable-static
+CONFIGURE_ARGS= --enable-static --disable-documentation
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
- ${WRKSRC}/tools/extra_defs_gen/Makefile.in
.include <bsd.port.mk>
diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo
index 31e15f82d845..93809e487ce3 100644
--- a/devel/gconfmm26/distinfo
+++ b/devel/gconfmm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconfmm-2.28.0.tar.bz2) = dad2999d8bbf88cf581fa512041d735e
-SHA256 (gnome2/gconfmm-2.28.0.tar.bz2) = 3daa3719f773cfc9fcee84766f60eab4579209978425221997120662bd621a52
-SIZE (gnome2/gconfmm-2.28.0.tar.bz2) = 305888
+MD5 (gnome2/gconfmm-2.28.2.tar.bz2) = cca6d249ab766895e1a180b7a4775733
+SHA256 (gnome2/gconfmm-2.28.2.tar.bz2) = 3e9575208ed1f43f0d0f42e62169a4e14d367a69829b3a531b943655f9db2ab9
+SIZE (gnome2/gconfmm-2.28.2.tar.bz2) = 459319
diff --git a/devel/gconfmm26/pkg-plist b/devel/gconfmm26/pkg-plist
index b9959427df3e..915656396295 100644
--- a/devel/gconfmm26/pkg-plist
+++ b/devel/gconfmm26/pkg-plist
@@ -15,15 +15,11 @@ include/gconfmm-%%API_VERSION%%/gconfmm/value.h
include/gconfmm-%%API_VERSION%%/gconfmm/value_listhelpers.h
include/gconfmm-%%API_VERSION%%/gconfmm/wrap_init.h
lib/gconfmm-%%API_VERSION%%/include/gconfmmconfig.h
-lib/gconfmm-%%API_VERSION%%/proc/m4/convert.m4
-lib/gconfmm-%%API_VERSION%%/proc/m4/convert_gconfmm.m4
lib/libgconfmm-%%VERSION%%.a
lib/libgconfmm-%%VERSION%%.la
lib/libgconfmm-%%VERSION%%.so
lib/libgconfmm-%%VERSION%%.so.1
libdata/pkgconfig/gconfmm-%%API_VERSION%%.pc
-@dirrm lib/gconfmm-%%API_VERSION%%/proc/m4
-@dirrm lib/gconfmm-%%API_VERSION%%/proc
@dirrm lib/gconfmm-%%API_VERSION%%/include
@dirrm lib/gconfmm-%%API_VERSION%%
@dirrm include/gconfmm-%%API_VERSION%%/gconfmm/private
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 9fd3022305b0..c5730215a3dc 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gvfs/Makefile,v 1.61 2010/04/26 12:09:46 kwm Exp $
+# $MCom: ports-stable/devel/gvfs/Makefile,v 1.4 2010/07/13 12:41:36 kwm Exp $
#
PORTNAME= gvfs
-PORTVERSION= 1.6.2
-PORTREVISION= 1
+PORTVERSION= 1.6.3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 9dcece1b1f77..74af4a70b7f5 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gvfs-1.6.2.tar.bz2) = 6ed1d943d1c1b8b15a6b180a6cd51043
-SHA256 (gnome2/gvfs-1.6.2.tar.bz2) = 3a422a16b6758ec405b79d8021e115fddf6a88a0278a5d35dd6bcd022cea7248
-SIZE (gnome2/gvfs-1.6.2.tar.bz2) = 1330089
+MD5 (gnome2/gvfs-1.6.3.tar.bz2) = 1c2e76b6c7c7ed603bab05753f971f82
+SHA256 (gnome2/gvfs-1.6.3.tar.bz2) = 4e3fe2dd80e5baaf4c1844560f6a787b144a917de1cb457b41efcb338477e760
+SIZE (gnome2/gvfs-1.6.3.tar.bz2) = 1347090
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index 1be92a4632e6..045d2c2b0c27 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -101,6 +101,7 @@ share/locale/hu/LC_MESSAGES/gvfs.mo
share/locale/id/LC_MESSAGES/gvfs.mo
share/locale/it/LC_MESSAGES/gvfs.mo
share/locale/ja/LC_MESSAGES/gvfs.mo
+share/locale/kk/LC_MESSAGES/gvfs.mo
share/locale/kn/LC_MESSAGES/gvfs.mo
share/locale/ko/LC_MESSAGES/gvfs.mo
share/locale/ku/LC_MESSAGES/gvfs.mo
@@ -156,6 +157,8 @@ share/locale/zh_TW/LC_MESSAGES/gvfs.mo
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 7a59b5f5ebd1..e8245274e91d 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libsigc++20/Makefile,v 1.14 2010/04/16 21:30:41 kwm Exp $
+# $MCom: ports-stable/devel/libsigc++20/Makefile,v 1.3 2010/06/23 22:49:38 kwm Exp $
#
PORTNAME= libsigc++
-PORTVERSION= 2.2.7
+PORTVERSION= 2.2.8
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/libsigc++20/distinfo b/devel/libsigc++20/distinfo
index a340d548ae1a..eeccdfc12f33 100644
--- a/devel/libsigc++20/distinfo
+++ b/devel/libsigc++20/distinfo
@@ -1,3 +1,3 @@
-MD5 (libsigc++-2.2.7.tar.bz2) = e80c0862eb4e1435eff55d1870aef4b8
-SHA256 (libsigc++-2.2.7.tar.bz2) = 2b8cc4670714458cd4fecefb00e7d5d2c717ae9b1963a057e7ebca1cd93baafa
-SIZE (libsigc++-2.2.7.tar.bz2) = 3738653
+MD5 (libsigc++-2.2.8.tar.bz2) = 1198425eab9fd605721a278c651b8dd8
+SHA256 (libsigc++-2.2.8.tar.bz2) = 0fd75fd8249e09ae2fd3ffd20c3fbaea11b47d71ba5ba2340ed98b6bdca40ea8
+SIZE (libsigc++-2.2.8.tar.bz2) = 3744672
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index cd128c014e40..ba19d0a3d7d0 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libsoup/Makefile,v 1.81 2010/04/27 18:17:04 kwm Exp $
+# $MCom: ports-stable/devel/libsoup/Makefile,v 1.12 2010/06/24 10:03:53 kwm Exp $
#
PORTNAME= libsoup
-PORTVERSION= 2.30.1
-PORTREVISION?= 1
+PORTVERSION= 2.30.2
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -22,7 +22,7 @@ USE_BZIP2= yes
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
proxy.0:${PORTSDIR}/net/libproxy \
- gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
+ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
sqlite3.8:${PORTSDIR}/databases/sqlite3
USE_GETTEXT= yes
diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo
index 558f6991712a..44dad240d554 100644
--- a/devel/libsoup/distinfo
+++ b/devel/libsoup/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libsoup-2.30.1.tar.bz2) = d80fb560a72370fba347785b00a750fb
-SHA256 (gnome2/libsoup-2.30.1.tar.bz2) = 6395c6e0bbcf4e822f1c5f3dd6f844116c571ed13cdf611d5c8f1dd4fe5777ed
-SIZE (gnome2/libsoup-2.30.1.tar.bz2) = 644401
+MD5 (gnome2/libsoup-2.30.2.tar.bz2) = f33b62063e76a9b1d5503363a3ed6a84
+SHA256 (gnome2/libsoup-2.30.2.tar.bz2) = 78ccbce84fccc74a49fb8168eeb409a6429a8a5854f197261d4108b8bb106bf6
+SIZE (gnome2/libsoup-2.30.2.tar.bz2) = 644337
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index be6899504191..885f4e466d47 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/gedit/Makefile,v 1.120 2010/04/19 15:33:49 kwm Exp $
+# $MCom: ports-stable/editors/gedit/Makefile,v 1.13 2010/06/22 20:00:07 kwm Exp $
#
PORTNAME= gedit
-PORTVERSION= 2.30.2
-PORTREVISION= 1
+PORTVERSION= 2.30.3
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 7a30af2fca91..0b215c12961f 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-2.30.2.tar.bz2) = 00ccd2fdba5c5e1d3bc54da5377f0277
-SHA256 (gnome2/gedit-2.30.2.tar.bz2) = bcaa3ececd38293524b12f793bc939268531ce7a2b7f49212362098cf36b1bd5
-SIZE (gnome2/gedit-2.30.2.tar.bz2) = 4715261
+MD5 (gnome2/gedit-2.30.3.tar.bz2) = 7c8ac5fe529285309f7d5750ee52b7bd
+SHA256 (gnome2/gedit-2.30.3.tar.bz2) = ab09e29e70fa830ed453a2ffb3e80f614cc7df4f3b89b3d3d1234a4936ffecf6
+SIZE (gnome2/gedit-2.30.3.tar.bz2) = 4729828
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index c6ba750e9031..4b107e9944ef 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnome-games/Makefile,v 1.218 2010/04/27 19:42:25 kwm Exp $
+# $MCom: ports-stable/games/gnome-games/Makefile,v 1.6 2010/07/21 18:17:43 kwm Exp $
#
PORTNAME= gnome-games
-PORTVERSION= 2.30.1
+PORTVERSION= 2.30.2
PORTREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= GNOME
@@ -19,8 +19,7 @@ COMMENT= The game applications package for the GNOME 2 Desktop Environment
BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile \
clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \
- clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter \
- ggzmod.5:${PORTSDIR}/games/ggz-client-libs
+ clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter
RUN_DEPENDS= seed:${PORTSDIR}/devel/seed \
${LOCALBASE}/share/gir-1.0/GConf-2.0.gir:${PORTSDIR}/devel/gir-repository-gconf2
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 10dab5d62b4a..9a53c469a7e1 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-2.30.1.tar.bz2) = d3cbdc3531c9a23d55add25d5b7d4d5e
-SHA256 (gnome2/gnome-games-2.30.1.tar.bz2) = 9adc8067bbf02e0dc0ccd5a1fe98d95b88f96e378e2d577543befc3ed6302da1
-SIZE (gnome2/gnome-games-2.30.1.tar.bz2) = 27625895
+MD5 (gnome2/gnome-games-2.30.2.tar.bz2) = 1fc03fe2209aa8a70da8f25d6eae1735
+SHA256 (gnome2/gnome-games-2.30.2.tar.bz2) = 57c3f3685cdd49016dfbf236f4a1d98c9d669d456fabe0aeb6f5a4128dba3586
+SIZE (gnome2/gnome-games-2.30.2.tar.bz2) = 27683256
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 7b1f1c069181..7bde75717760 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -1494,6 +1494,7 @@ share/gnome/help/gnomine/zh_CN/figures/preferences.png
share/gnome/help/gnomine/zh_CN/figures/statusbar.png
share/gnome/help/gnomine/zh_CN/gnomine.xml
share/gnome/help/gnomine/sv/gnomine.xml
+share/gnome/help/gnotravex/C/figures/gnotravex-logo.png
share/gnome/help/gnotravex/C/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/C/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/C/gameplay.page
@@ -1506,6 +1507,7 @@ share/gnome/help/gnotravex/C/shortcut.page
share/gnome/help/gnotravex/C/size.page
share/gnome/help/gnotravex/C/usage.page
share/gnome/help/gnotravex/C/winning.page
+share/gnome/help/gnotravex/ca/figures/gnotravex-logo.png
share/gnome/help/gnotravex/ca/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/ca/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/ca/gameplay.page
@@ -1518,6 +1520,7 @@ share/gnome/help/gnotravex/ca/shortcut.page
share/gnome/help/gnotravex/ca/size.page
share/gnome/help/gnotravex/ca/usage.page
share/gnome/help/gnotravex/ca/winning.page
+share/gnome/help/gnotravex/cs/figures/gnotravex-logo.png
share/gnome/help/gnotravex/cs/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/cs/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/cs/gameplay.page
@@ -1530,6 +1533,7 @@ share/gnome/help/gnotravex/cs/shortcut.page
share/gnome/help/gnotravex/cs/size.page
share/gnome/help/gnotravex/cs/usage.page
share/gnome/help/gnotravex/cs/winning.page
+share/gnome/help/gnotravex/da/figures/gnotravex-logo.png
share/gnome/help/gnotravex/da/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/da/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/da/gameplay.page
@@ -1542,6 +1546,7 @@ share/gnome/help/gnotravex/da/shortcut.page
share/gnome/help/gnotravex/da/size.page
share/gnome/help/gnotravex/da/usage.page
share/gnome/help/gnotravex/da/winning.page
+share/gnome/help/gnotravex/de/figures/gnotravex-logo.png
share/gnome/help/gnotravex/de/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/de/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/de/gameplay.page
@@ -1554,6 +1559,7 @@ share/gnome/help/gnotravex/de/shortcut.page
share/gnome/help/gnotravex/de/size.page
share/gnome/help/gnotravex/de/usage.page
share/gnome/help/gnotravex/de/winning.page
+share/gnome/help/gnotravex/el/figures/gnotravex-logo.png
share/gnome/help/gnotravex/el/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/el/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/el/gameplay.page
@@ -1566,6 +1572,7 @@ share/gnome/help/gnotravex/el/shortcut.page
share/gnome/help/gnotravex/el/size.page
share/gnome/help/gnotravex/el/usage.page
share/gnome/help/gnotravex/el/winning.page
+share/gnome/help/gnotravex/en_GB/figures/gnotravex-logo.png
share/gnome/help/gnotravex/en_GB/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/en_GB/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/en_GB/gameplay.page
@@ -1578,6 +1585,7 @@ share/gnome/help/gnotravex/en_GB/shortcut.page
share/gnome/help/gnotravex/en_GB/size.page
share/gnome/help/gnotravex/en_GB/usage.page
share/gnome/help/gnotravex/en_GB/winning.page
+share/gnome/help/gnotravex/es/figures/gnotravex-logo.png
share/gnome/help/gnotravex/es/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/es/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/es/gameplay.page
@@ -1590,6 +1598,7 @@ share/gnome/help/gnotravex/es/shortcut.page
share/gnome/help/gnotravex/es/size.page
share/gnome/help/gnotravex/es/usage.page
share/gnome/help/gnotravex/es/winning.page
+share/gnome/help/gnotravex/eu/figures/gnotravex-logo.png
share/gnome/help/gnotravex/eu/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/eu/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/eu/gameplay.page
@@ -1602,6 +1611,7 @@ share/gnome/help/gnotravex/eu/shortcut.page
share/gnome/help/gnotravex/eu/size.page
share/gnome/help/gnotravex/eu/usage.page
share/gnome/help/gnotravex/eu/winning.page
+share/gnome/help/gnotravex/fr/figures/gnotravex-logo.png
share/gnome/help/gnotravex/fr/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/fr/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/fr/gameplay.page
@@ -1614,6 +1624,7 @@ share/gnome/help/gnotravex/fr/shortcut.page
share/gnome/help/gnotravex/fr/size.page
share/gnome/help/gnotravex/fr/usage.page
share/gnome/help/gnotravex/fr/winning.page
+share/gnome/help/gnotravex/it/figures/gnotravex-logo.png
share/gnome/help/gnotravex/it/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/it/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/it/gameplay.page
@@ -1626,6 +1637,7 @@ share/gnome/help/gnotravex/it/shortcut.page
share/gnome/help/gnotravex/it/size.page
share/gnome/help/gnotravex/it/usage.page
share/gnome/help/gnotravex/it/winning.page
+share/gnome/help/gnotravex/oc/figures/gnotravex-logo.png
share/gnome/help/gnotravex/oc/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/oc/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/oc/gameplay.page
@@ -1638,6 +1650,7 @@ share/gnome/help/gnotravex/oc/shortcut.page
share/gnome/help/gnotravex/oc/size.page
share/gnome/help/gnotravex/oc/usage.page
share/gnome/help/gnotravex/oc/winning.page
+share/gnome/help/gnotravex/ru/figures/gnotravex-logo.png
share/gnome/help/gnotravex/ru/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/ru/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/ru/gameplay.page
@@ -1650,6 +1663,7 @@ share/gnome/help/gnotravex/ru/shortcut.page
share/gnome/help/gnotravex/ru/size.page
share/gnome/help/gnotravex/ru/usage.page
share/gnome/help/gnotravex/ru/winning.page
+share/gnome/help/gnotravex/sl/figures/gnotravex-logo.png
share/gnome/help/gnotravex/sl/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/sl/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/sl/gameplay.page
@@ -1662,6 +1676,7 @@ share/gnome/help/gnotravex/sl/shortcut.page
share/gnome/help/gnotravex/sl/size.page
share/gnome/help/gnotravex/sl/usage.page
share/gnome/help/gnotravex/sl/winning.page
+share/gnome/help/gnotravex/sr/figures/gnotravex-logo.png
share/gnome/help/gnotravex/sr/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/sr/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/sr/gameplay.page
@@ -1674,6 +1689,7 @@ share/gnome/help/gnotravex/sr/shortcut.page
share/gnome/help/gnotravex/sr/size.page
share/gnome/help/gnotravex/sr/usage.page
share/gnome/help/gnotravex/sr/winning.page
+share/gnome/help/gnotravex/sr@latin/figures/gnotravex-logo.png
share/gnome/help/gnotravex/sr@latin/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/sr@latin/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/sr@latin/gameplay.page
@@ -1686,6 +1702,7 @@ share/gnome/help/gnotravex/sr@latin/shortcut.page
share/gnome/help/gnotravex/sr@latin/size.page
share/gnome/help/gnotravex/sr@latin/usage.page
share/gnome/help/gnotravex/sr@latin/winning.page
+share/gnome/help/gnotravex/sv/figures/gnotravex-logo.png
share/gnome/help/gnotravex/sv/figures/gnotravex-main-window.png
share/gnome/help/gnotravex/sv/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/sv/gameplay.page
@@ -1708,6 +1725,9 @@ share/gnome/help/gnotski/ca/gnotski.xml
share/gnome/help/gnotski/cs/figures/gnotski_start_window.png
share/gnome/help/gnotski/cs/figures/gnotski_win.png
share/gnome/help/gnotski/cs/gnotski.xml
+share/gnome/help/gnotski/da/figures/gnotski_start_window.png
+share/gnome/help/gnotski/da/figures/gnotski_win.png
+share/gnome/help/gnotski/da/gnotski.xml
share/gnome/help/gnotski/de/figures/gnotski_start_window.png
share/gnome/help/gnotski/de/figures/gnotski_win.png
share/gnome/help/gnotski/de/gnotski.xml
@@ -2422,6 +2442,7 @@ share/omf/gnomine/gnomine-zh_CN.omf
share/omf/gnotski/gnotski-C.omf
share/omf/gnotski/gnotski-ca.omf
share/omf/gnotski/gnotski-cs.omf
+share/omf/gnotski/gnotski-da.omf
share/omf/gnotski/gnotski-de.omf
share/omf/gnotski/gnotski-el.omf
share/omf/gnotski/gnotski-en_GB.omf
@@ -2701,6 +2722,8 @@ share/omf/swell-foop/swell-foop-sv.omf
@dirrm share/gnome/help/gnotski/el
@dirrm share/gnome/help/gnotski/de/figures
@dirrm share/gnome/help/gnotski/de
+@dirrm share/gnome/help/gnotski/da/figures
+@dirrm share/gnome/help/gnotski/da
@dirrm share/gnome/help/gnotski/cs/figures
@dirrm share/gnome/help/gnotski/cs
@dirrm share/gnome/help/gnotski/ca/figures
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 3fe59e2ac5bb..19138147f06a 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -3,11 +3,11 @@
# Whom: Martin Wilke <miwi@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports-stable/graphics/clutter/Makefile,v 1.1 2010/07/15 14:48:21 kwm Exp $
#
PORTNAME= clutter
-PORTVERSION= 1.2.8
-PORTREVISION= 1
+PORTVERSION= 1.2.12
CATEGORIES= graphics
MASTER_SITES= GNOME \
http://www.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo
index 328962dcf1ca..99cb48c39429 100644
--- a/graphics/clutter/distinfo
+++ b/graphics/clutter/distinfo
@@ -1,3 +1,3 @@
-MD5 (clutter-1.2.8.tar.bz2) = a94f5492465cb048115e066ebb9cbd58
-SHA256 (clutter-1.2.8.tar.bz2) = bdc1583572546bf1d5497fcb36b1affaf868af6213d04c720274ab96c3996179
-SIZE (clutter-1.2.8.tar.bz2) = 2388895
+MD5 (clutter-1.2.12.tar.bz2) = 76f70e765adcf7146be1ceb50bafa14f
+SHA256 (clutter-1.2.12.tar.bz2) = 4582e6579897374d1f8ce51daa330311ebb90033fad95d5f076c1e9392b4ae68
+SIZE (clutter-1.2.12.tar.bz2) = 2396325
diff --git a/graphics/clutter/files/patch-clutter_glx_clutter-stage-glx.c b/graphics/clutter/files/patch-clutter_glx_clutter-stage-glx.c
new file mode 100644
index 000000000000..fff439a43af2
--- /dev/null
+++ b/graphics/clutter/files/patch-clutter_glx_clutter-stage-glx.c
@@ -0,0 +1,12 @@
+--- clutter/glx/clutter-stage-glx.c.orig 2010-07-15 15:58:02.000000000 +0000
++++ clutter/glx/clutter-stage-glx.c 2010-07-15 15:58:25.000000000 +0000
+@@ -487,8 +487,8 @@
+ (retraceCount + 1) % 2,
+ &retraceCount);
+ }
+- else
+ #ifdef __linux__
++ else
+ {
+ drm_wait_vblank_t blank;
+
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index 1cf19ccf66e1..fe68490b16a3 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/eog-plugins/Makefile,v 1.12 2010/04/02 08:40:07 avl Exp $
+# $MCom: ports-stable/graphics/eog-plugins/Makefile,v 1.1 2010/06/23 15:28:22 kwm Exp $
#
PORTNAME= eog-plugins
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.30.1
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/eog-plugins/distinfo b/graphics/eog-plugins/distinfo
index 1e4bf4a77b83..479adc45f3c6 100644
--- a/graphics/eog-plugins/distinfo
+++ b/graphics/eog-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eog-plugins-2.30.0.tar.bz2) = c5ae61e03169cefd0220a3a2642065fa
-SHA256 (gnome2/eog-plugins-2.30.0.tar.bz2) = dfc6fdcefc128e6bc84b00acdf0b124cfd5b814aef62ce1320d505805743c1cb
-SIZE (gnome2/eog-plugins-2.30.0.tar.bz2) = 337547
+MD5 (gnome2/eog-plugins-2.30.1.tar.bz2) = 72b89b93e56d1fb58480cb8dd3d980d7
+SHA256 (gnome2/eog-plugins-2.30.1.tar.bz2) = 0e651053367e1d6aecfb8058a93dcac2223ec822a691ee134e9a879662580caf
+SIZE (gnome2/eog-plugins-2.30.1.tar.bz2) = 344700
diff --git a/graphics/eog-plugins/pkg-plist b/graphics/eog-plugins/pkg-plist
index 1d703d355a53..4d8d40e9bf93 100644
--- a/graphics/eog-plugins/pkg-plist
+++ b/graphics/eog-plugins/pkg-plist
@@ -46,6 +46,7 @@ share/locale/fr/LC_MESSAGES/eog-plugins.mo
share/locale/gl/LC_MESSAGES/eog-plugins.mo
share/locale/gu/LC_MESSAGES/eog-plugins.mo
share/locale/hu/LC_MESSAGES/eog-plugins.mo
+share/locale/id/LC_MESSAGES/eog-plugins.mo
share/locale/it/LC_MESSAGES/eog-plugins.mo
share/locale/ja/LC_MESSAGES/eog-plugins.mo
share/locale/kn/LC_MESSAGES/eog-plugins.mo
@@ -64,6 +65,7 @@ share/locale/sq/LC_MESSAGES/eog-plugins.mo
share/locale/sv/LC_MESSAGES/eog-plugins.mo
share/locale/ta/LC_MESSAGES/eog-plugins.mo
share/locale/te/LC_MESSAGES/eog-plugins.mo
+share/locale/uk/LC_MESSAGES/eog-plugins.mo
share/locale/vi/LC_MESSAGES/eog-plugins.mo
share/locale/zh_CN/LC_MESSAGES/eog-plugins.mo
share/locale/zh_HK/LC_MESSAGES/eog-plugins.mo
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index b3bca34814e3..7c2d37be98da 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/eog/Makefile,v 1.113 2010/04/27 18:11:36 kwm Exp $
+# $MCom: ports-stable/graphics/eog/Makefile,v 1.10 2010/06/23 15:24:15 kwm Exp $
#
PORTNAME= eog
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.30.2
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index 502a75ac166d..e744a76a973f 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eog-2.30.1.tar.bz2) = b9ea1f6e28c3f1890792d847f23ee82f
-SHA256 (gnome2/eog-2.30.1.tar.bz2) = d245d96d791c88197dda1f667c196cb4134f9ce88596e696d5fbcddb6747ecf6
-SIZE (gnome2/eog-2.30.1.tar.bz2) = 2691413
+MD5 (gnome2/eog-2.30.2.tar.bz2) = 2f7fdf9392f24229fd82c53e8465f998
+SHA256 (gnome2/eog-2.30.2.tar.bz2) = 0f508cbc1727181122410f921f54d6c1464d0b98d544a04bd7d021d43d2ab91b
+SIZE (gnome2/eog-2.30.2.tar.bz2) = 2789170
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 664949501f45..0d8ca576f30b 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -151,6 +151,10 @@ share/gnome/help/eog/eu/eog.xml
share/gnome/help/eog/eu/figures/eog_save_as_window.png
share/gnome/help/eog/eu/figures/eog_start_window.png
share/gnome/help/eog/eu/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/fi/eog.xml
+share/gnome/help/eog/fi/figures/eog_save_as_window.png
+share/gnome/help/eog/fi/figures/eog_start_window.png
+share/gnome/help/eog/fi/figures/eog_toolbar_editor_window.png
share/gnome/help/eog/fr/eog.xml
share/gnome/help/eog/fr/figures/eog_save_as_window.png
share/gnome/help/eog/fr/figures/eog_start_window.png
@@ -317,6 +321,7 @@ share/omf/eog/eog-el.omf
share/omf/eog/eog-en_GB.omf
share/omf/eog/eog-es.omf
share/omf/eog/eog-eu.omf
+share/omf/eog/eog-fi.omf
share/omf/eog/eog-fr.omf
share/omf/eog/eog-it.omf
share/omf/eog/eog-ja.omf
@@ -360,6 +365,8 @@ share/omf/eog/eog-zh_TW.omf
@dirrm share/gnome/help/eog/it
@dirrm share/gnome/help/eog/fr/figures
@dirrm share/gnome/help/eog/fr
+@dirrm share/gnome/help/eog/fi/figures
+@dirrm share/gnome/help/eog/fi
@dirrm share/gnome/help/eog/eu/figures
@dirrm share/gnome/help/eog/eu
@dirrm share/gnome/help/eog/es/figures
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index c5d0ccb88d1f..67a7c21748a2 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,12 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/evince/Makefile,v 1.137 2010/04/27 14:14:36 kwm Exp $
+# $MCom: ports-stable/graphics/evince/Makefile,v 1.11 2010/06/24 10:03:54 kwm Exp $
#
PORTNAME= evince
-PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTVERSION= 2.30.3
+PORTREVISION= 1
CATEGORIES= graphics print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -78,7 +78,7 @@ PLIST_SUB+= NAUTILUS=""
BUILD_DEPENDS+= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
RUN_DEPENDS+= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
.if !defined(WITHOUT_KEYRING)
-LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
.else
CONFIGURE_ARGS+= --without-keyring
.endif
diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo
index 48317462f62f..8c3b0f42b085 100644
--- a/graphics/evince/distinfo
+++ b/graphics/evince/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evince-2.30.1.tar.bz2) = 84eb6c8bb460edd382025fdd29c3bc64
-SHA256 (gnome2/evince-2.30.1.tar.bz2) = ab6b957ab422341f023baa8ee4061bc5719389f92d6745874d239cd1e737f225
-SIZE (gnome2/evince-2.30.1.tar.bz2) = 2177738
+MD5 (gnome2/evince-2.30.3.tar.bz2) = 516748897113cd4e9638c49245c555c2
+SHA256 (gnome2/evince-2.30.3.tar.bz2) = daddd9720bf8fc0156d9a4a5a85485c232393896376707cf7fcedfcbc515732f
+SIZE (gnome2/evince-2.30.3.tar.bz2) = 2180874
diff --git a/graphics/evince/files/patch-shell_ev-window.c b/graphics/evince/files/patch-shell_ev-window.c
deleted file mode 100644
index 0e8ddac0b4f9..000000000000
--- a/graphics/evince/files/patch-shell_ev-window.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- shell/ev-window.c.orig 2010-07-05 20:36:07.000000000 -0400
-+++ shell/ev-window.c 2010-07-05 20:36:10.000000000 -0400
-@@ -6107,7 +6107,7 @@ ev_window_create_last_settings_metadata
- GFile *file;
- gchar *path;
-
-- path = g_build_filename (ev_application_get_dot_dir (EV_APP, FALSE), "last_settings", NULL);
-+ path = g_build_filename (ev_application_get_dot_dir (EV_APP, TRUE), "last_settings", NULL);
- file = g_file_new_for_path (path);
- g_free (path);
-
diff --git a/graphics/poppler-data/Makefile b/graphics/poppler-data/Makefile
index e56b3381f3f1..b05175647c61 100644
--- a/graphics/poppler-data/Makefile
+++ b/graphics/poppler-data/Makefile
@@ -3,10 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports-stable/graphics/poppler-data/Makefile,v 1.1 2010/07/20 08:17:51 kwm Exp $
#
PORTNAME= poppler-data
-PORTVERSION= 0.4.2
+PORTVERSION= 0.4.3
CATEGORIES= graphics
MASTER_SITES= http://poppler.freedesktop.org/
diff --git a/graphics/poppler-data/distinfo b/graphics/poppler-data/distinfo
index 71023bdf8010..a48d0a2bc6bc 100644
--- a/graphics/poppler-data/distinfo
+++ b/graphics/poppler-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-data-0.4.2.tar.gz) = 4b7598072bb95686f58bdadc4f09715c
-SHA256 (poppler-data-0.4.2.tar.gz) = 1176ac722665d45036d72d7d225bd7d293e74f532a0a1c68d826c034c7ef14ed
-SIZE (poppler-data-0.4.2.tar.gz) = 4171982
+MD5 (poppler-data-0.4.3.tar.gz) = 2d648047e5d0b315df1571b460ee6a96
+SHA256 (poppler-data-0.4.3.tar.gz) = 426010488bfb8c923419ca4c5d4916ea0193a140d2246336fdf97f1b632d58a6
+SIZE (poppler-data-0.4.3.tar.gz) = 4175311
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 703ee2ac3f3b..497e27e1de48 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger, based off kiesel's ximian-exchange port
#
# $FreeBSD$
-# $MCom: ports/mail/evolution-exchange/Makefile,v 1.158 2010/04/27 18:38:50 kwm Exp $
+# $MCom: ports-stable/mail/evolution-exchange/Makefile,v 1.5 2010/06/23 11:38:54 kwm Exp $
#
PORTNAME= evolution-exchange
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.30.2
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index e487b8720530..7b9938ea9e2b 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.30.1.tar.bz2) = 9225241ba14d1e2183fe21078c7ed03e
-SHA256 (gnome2/evolution-exchange-2.30.1.tar.bz2) = f53904d90f058ef1bbe1c5d851590f3729d9b3489c80dad73edb46bbba2dae11
-SIZE (gnome2/evolution-exchange-2.30.1.tar.bz2) = 1330038
+MD5 (gnome2/evolution-exchange-2.30.2.tar.bz2) = 6ab8102ef129bc3285c96e733f145092
+SHA256 (gnome2/evolution-exchange-2.30.2.tar.bz2) = 15132026603650f6c1e64d6d8fd972e5fba0436c4301592f9229fee000ab5224
+SIZE (gnome2/evolution-exchange-2.30.2.tar.bz2) = 1331852
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index a23c47f679d6..d594d0dd37b5 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/evolution-mapi/Makefile,v 1.14 2010/04/28 08:29:07 kwm Exp $
+# $MCom: ports-stable/mail/evolution-mapi/Makefile,v 1.1 2010/06/23 09:55:28 kwm Exp $
#
PORTNAME= evolution-mapi
-PORTVERSION= 0.30.1
-PORTREVISION= 1
+PORTVERSION= 0.30.2.1
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/mail/evolution-mapi/distinfo b/mail/evolution-mapi/distinfo
index 5faa59ed4e99..ed162b173147 100644
--- a/mail/evolution-mapi/distinfo
+++ b/mail/evolution-mapi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-mapi-0.30.1.tar.bz2) = 73577721e07b2a7f15f9c6dfefe7d4e0
-SHA256 (gnome2/evolution-mapi-0.30.1.tar.bz2) = b435225156cb533469c359e9ee659d4bbc21a72860ed15f6faa6835d305c1e9b
-SIZE (gnome2/evolution-mapi-0.30.1.tar.bz2) = 493037
+MD5 (gnome2/evolution-mapi-0.30.2.1.tar.bz2) = 5f112db43c1e0c22cd9e620d90432839
+SHA256 (gnome2/evolution-mapi-0.30.2.1.tar.bz2) = 995bf3479d6aa04e13b39e1c14aa274c3f8a19680feff174dd8c60a9f0efdcf1
+SIZE (gnome2/evolution-mapi-0.30.2.1.tar.bz2) = 509298
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 247e0a0279ca..cf39417d8288 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,12 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/evolution/Makefile,v 1.222 2010/04/27 12:12:48 kwm Exp $
+# $MCom: ports-stable/mail/evolution/Makefile,v 1.5 2010/06/23 07:04:02 kwm Exp $
#
PORTNAME= evolution
-PORTVERSION= 2.30.1.2
-PORTREVISION= 3
+PORTVERSION= 2.30.2
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 0c6c453a96f4..5722b505f05b 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.30.1.2.tar.bz2) = 833d2ccff2a34e595e09fc9d499de231
-SHA256 (gnome2/evolution-2.30.1.2.tar.bz2) = 8b946914e53135edf89f9ddb8667d0ca3d76d37d8c622888befd65b2c4d3ce24
-SIZE (gnome2/evolution-2.30.1.2.tar.bz2) = 30681129
+MD5 (gnome2/evolution-2.30.2.tar.bz2) = ff2f1843d9f61e151a6bccf89eeff088
+SHA256 (gnome2/evolution-2.30.2.tar.bz2) = 470d12c0de9cae2dc0275152a356150c7a57339e6feca77f43508bd7d1f04d83
+SIZE (gnome2/evolution-2.30.2.tar.bz2) = 32570501
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 116deb3d3080..d643ea6e0d3a 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,5 +1,4 @@
bin/evolution
-bin/evolution-alarm-notify
bin/evolution-settings
etc/xdg/autostart/evolution-alarm-notify.desktop
include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h
@@ -629,6 +628,7 @@ libdata/pkgconfig/evolution-shell.pc
libexec/evolution/%%VERSION%%/csv2vcard
libexec/evolution/%%VERSION%%/evolution-addressbook-clean
libexec/evolution/%%VERSION%%/evolution-addressbook-export
+libexec/evolution/%%VERSION%%/evolution-alarm-notify
libexec/evolution/%%VERSION%%/evolution-backup
libexec/evolution/%%VERSION%%/killev
share/applications/evolution.desktop
@@ -754,6 +754,8 @@ share/doc/eshell/up.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_bell.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_contact-list.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_insert-note.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_insert-rule.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_insert-table.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-filters-apply.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-flag-for-followup-done.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-flag-for-followup.png
@@ -770,6 +772,7 @@ share/doc/eshell/up.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task-assigned.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task-recurring.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_text-monospaced.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_timezone.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_todo.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_video-conferencing.png
@@ -798,6 +801,9 @@ share/doc/eshell/up.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-workweek.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_contact-list.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_insert-note.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_insert-rule.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_insert-table.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_text-monospaced.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-filters-apply.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-open-multiple.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-unread-multiple.png
@@ -1855,7 +1861,6 @@ share/locale/xh/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/mime-info/evolution.keys
share/mime-info/evolution.mime
share/omf/evolution/evolution-C.omf
share/omf/evolution/evolution-cs.omf
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 5d5ca846a5a6..1a2bf4b55639 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/math/gcalctool/Makefile,v 1.132 2010/04/26 11:11:43 kwm Exp $
+# $MCom: ports-stable/math/gcalctool/Makefile,v 1.11 2010/06/23 15:50:52 kwm Exp $
#
PORTNAME= gcalctool
-PORTVERSION= 5.30.1
-PORTREVISION= 1
+PORTVERSION= 5.30.2
PORTEPOCH= 2
CATEGORIES= math gnome
MASTER_SITES= GNOME
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index 06f7f2466606..76eb245b3106 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gcalctool-5.30.1.tar.bz2) = fc54536bab41161f2e3ccc206c32976f
-SHA256 (gnome2/gcalctool-5.30.1.tar.bz2) = 2979924df4eaa37d1ecba90753b1c23e3c662f9247c0e2394f4a9d4c51802eef
-SIZE (gnome2/gcalctool-5.30.1.tar.bz2) = 1125957
+MD5 (gnome2/gcalctool-5.30.2.tar.bz2) = 9357de6835da305ee4f0ebad509b509a
+SHA256 (gnome2/gcalctool-5.30.2.tar.bz2) = 214580306a0029d8247b79e3e710a40328b9e022f8fcee1cd448c5d2467d8c4b
+SIZE (gnome2/gcalctool-5.30.2.tar.bz2) = 1126899
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 681c1f23922a..3074ef428d66 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net-im/empathy/Makefile,v 1.66 2010/04/26 23:54:08 kwm Exp $
+# $MCom: ports-stable/net-im/empathy/Makefile,v 1.5 2010/06/23 14:00:15 kwm Exp $
PORTNAME= empathy
-PORTVERSION= 2.30.1.1
+PORTVERSION= 2.30.2
CATEGORIES= net-im gnome
MASTER_SITES= GNOME
diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo
index 379cf186bcd1..a03dd4772157 100644
--- a/net-im/empathy/distinfo
+++ b/net-im/empathy/distinfo
@@ -1,3 +1,3 @@
-MD5 (empathy-2.30.1.1.tar.bz2) = f02660848dcb5fbdca4382e6cb5d69fc
-SHA256 (empathy-2.30.1.1.tar.bz2) = 347c3e8ebaac0af5110a5b7b8c1869dd03dc3caa2eb57589dd1ff630f3073cb7
-SIZE (empathy-2.30.1.1.tar.bz2) = 2645135
+MD5 (empathy-2.30.2.tar.bz2) = 964b48ccc63a2acdd14224eb763d6bf6
+SHA256 (empathy-2.30.2.tar.bz2) = e96846bafcedf39f9869d656031ba1c02c3568038e968db308ff07552e5024d7
+SIZE (empathy-2.30.2.tar.bz2) = 2644286
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index 9e38946cb3d2..c0f6aa869fbc 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/libgweather/Makefile,v 1.40 2010/04/02 05:22:25 avl Exp $
+# $MCom: ports-stable/net/libgweather/Makefile,v 1.3 2010/06/24 07:55:55 kwm Exp $
#
PORTNAME= libgweather
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.30.2
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo
index 8bcf1e8d0807..c81de304d034 100644
--- a/net/libgweather/distinfo
+++ b/net/libgweather/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgweather-2.30.0.tar.bz2) = bf7ae6cb4eca85be3e9099a5de94c655
-SHA256 (libgweather-2.30.0.tar.bz2) = 25cd8976f98b79f7c336551bea7179a5b29027e95d3ba6a046c638422d440548
-SIZE (libgweather-2.30.0.tar.bz2) = 7314206
+MD5 (libgweather-2.30.2.tar.bz2) = 050f4ed212261c2a147c89012d5daa90
+SHA256 (libgweather-2.30.2.tar.bz2) = dd98545cd4aaa2a856e62c9cc7822baf8d5f54bd277fd56ed8de6728dd61e312
+SIZE (libgweather-2.30.2.tar.bz2) = 7452039
diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist
index 5b9f540b9702..29fa4ba9bbb4 100644
--- a/net/libgweather/pkg-plist
+++ b/net/libgweather/pkg-plist
@@ -394,6 +394,7 @@ share/icons/gnome/scalable/status/weather-few-clouds-night-350.svg
%%DATADIR%%/Locations.bs.xml
%%DATADIR%%/Locations.ca.xml
%%DATADIR%%/Locations.ca@valencia.xml
+%%DATADIR%%/Locations.crh.xml
%%DATADIR%%/Locations.cs.xml
%%DATADIR%%/Locations.cy.xml
%%DATADIR%%/Locations.da.xml
@@ -403,6 +404,7 @@ share/icons/gnome/scalable/status/weather-few-clouds-night-350.svg
%%DATADIR%%/Locations.en_CA.xml
%%DATADIR%%/Locations.en_GB.xml
%%DATADIR%%/Locations.en@shaw.xml
+%%DATADIR%%/Locations.eo.xml
%%DATADIR%%/Locations.es.xml
%%DATADIR%%/Locations.et.xml
%%DATADIR%%/Locations.eu.xml
@@ -465,6 +467,7 @@ share/icons/gnome/scalable/status/weather-few-clouds-night-350.svg
%%DATADIR%%/Locations.zh_HK.xml
%%DATADIR%%/Locations.zh_TW.xml
%%DATADIR%%/locations.dtd
+share/locale/af/LC_MESSAGES/libgweather.mo
share/locale/am/LC_MESSAGES/libgweather.mo
share/locale/ar/LC_MESSAGES/libgweather.mo
share/locale/as/LC_MESSAGES/libgweather.mo
@@ -479,6 +482,7 @@ share/locale/br/LC_MESSAGES/libgweather.mo
share/locale/bs/LC_MESSAGES/libgweather.mo
share/locale/ca/LC_MESSAGES/libgweather.mo
share/locale/ca@valencia/LC_MESSAGES/libgweather.mo
+share/locale/crh/LC_MESSAGES/libgweather.mo
share/locale/cs/LC_MESSAGES/libgweather.mo
share/locale/cy/LC_MESSAGES/libgweather.mo
share/locale/da/LC_MESSAGES/libgweather.mo
@@ -488,6 +492,7 @@ share/locale/el/LC_MESSAGES/libgweather.mo
share/locale/en_CA/LC_MESSAGES/libgweather.mo
share/locale/en_GB/LC_MESSAGES/libgweather.mo
share/locale/en@shaw/LC_MESSAGES/libgweather.mo
+share/locale/eo/LC_MESSAGES/libgweather.mo
share/locale/es/LC_MESSAGES/libgweather.mo
share/locale/es_AR/LC_MESSAGES/libgweather.mo
share/locale/es_CL/LC_MESSAGES/libgweather.mo
@@ -636,6 +641,8 @@ share/locale/zh_TW/LC_MESSAGES/libgweather.mo
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index a66e27ad04ad..154ce5ca56e5 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/vinagre/Makefile,v 1.40 2010/05/04 14:13:29 kwm Exp $
+# $MCom: ports-stable/net/vinagre/Makefile,v 1.5 2010/07/25 00:14:30 marcus Exp $
#
PORTNAME= vinagre
-PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTVERSION= 2.30.2
+PORTREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -19,7 +19,7 @@ COMMENT= VNC client for the GNOME Desktop
LIB_DEPENDS= gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \
avahi-core.7:${PORTSDIR}/net/avahi-app \
avahi-ui.0:${PORTSDIR}/net/avahi-gtk \
- gnome-keyring:${PORTSDIR}/security/gnome-keyring
+ gnome-keyring:${PORTSDIR}/security/libgnome-keyring
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index b8e940468dbb..c34d4e90f159 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vinagre-2.30.1.tar.bz2) = 6ce972d2766ff5b3a64d2e5f1173b672
-SHA256 (gnome2/vinagre-2.30.1.tar.bz2) = cbe5bff8e6f7a81e46fde5b1d8a53a7dbdd66d13d998c24508cae08de657f2cf
-SIZE (gnome2/vinagre-2.30.1.tar.bz2) = 2413882
+MD5 (gnome2/vinagre-2.30.2.tar.bz2) = 2483369947e7914b5ac2aae8200f6452
+SHA256 (gnome2/vinagre-2.30.2.tar.bz2) = 478b58ad9eb4a02fad45134bdddc29dc986d8c14e203a47b88aa7f3e6d1bf388
+SIZE (gnome2/vinagre-2.30.2.tar.bz2) = 2424224
diff --git a/ports-mgmt/gnome-packagekit/Makefile b/ports-mgmt/gnome-packagekit/Makefile
index 159e21c1cb1d..24dc2ae9408e 100644
--- a/ports-mgmt/gnome-packagekit/Makefile
+++ b/ports-mgmt/gnome-packagekit/Makefile
@@ -3,11 +3,10 @@
# Whom: Anders F Bjorklund <afb@users.sourceforge.net>
#
# $FreeBSD$
-# $MCom: ports/ports-mgmt/gnome-packagekit/Makefile,v 1.14 2010/03/30 11:24:01 avl Exp $
+# $MCom: ports-stable/ports-mgmt/gnome-packagekit/Makefile,v 1.1 2010/07/21 15:21:03 kwm Exp $
PORTNAME= gnome-packagekit
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.30.3
CATEGORIES= ports-mgmt sysutils gnome
MASTER_SITES= GNOME
diff --git a/ports-mgmt/gnome-packagekit/distinfo b/ports-mgmt/gnome-packagekit/distinfo
index ca10eeffda57..dc31a1d7c879 100644
--- a/ports-mgmt/gnome-packagekit/distinfo
+++ b/ports-mgmt/gnome-packagekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-packagekit-2.30.0.tar.bz2) = 6f96d71ad1567122075ab60d4dd60a98
-SHA256 (gnome-packagekit-2.30.0.tar.bz2) = 79738a368a7e4fd051c9fd95fe280ee244160cbf84b8044aa79747d2ab037ee9
-SIZE (gnome-packagekit-2.30.0.tar.bz2) = 3521537
+MD5 (gnome-packagekit-2.30.3.tar.bz2) = 865675fb52f131083e76f97c9a630def
+SHA256 (gnome-packagekit-2.30.3.tar.bz2) = 2fd9e49d0b538dac7223c170119507fdf5e896aa27683a9b886aef74e13651b1
+SIZE (gnome-packagekit-2.30.3.tar.bz2) = 3595882
diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus.c
new file mode 100644
index 000000000000..471734de6324
--- /dev/null
+++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus.c
@@ -0,0 +1,59 @@
+--- src/gpk-dbus.c.orig 2010-07-20 09:56:17.000000000 +0200
++++ src/gpk-dbus.c 2010-07-21 17:14:31.000000000 +0200
+@@ -32,6 +32,12 @@
+ #include <unistd.h>
+ #endif /* HAVE_UNISTD_H */
+
++#ifdef __FreeBSD__
++#include <sys/sysctl.h>
++//#include <errno.h>
++#include <string.h>
++#endif
++
+ #include <sys/wait.h>
+ #include <fcntl.h>
+
+@@ -212,6 +218,13 @@ gpk_dbus_get_exec_for_sender (GpkDbus *d
+ GError *error = NULL;
+ guint pid;
+
++#ifdef __FreeBSD__
++ size_t len;
++ int mib[4];
++/* figure out how to use the above GError */
++ int error2;
++#endif
++
+ g_return_val_if_fail (PK_IS_DBUS (dbus), NULL);
+ g_return_val_if_fail (sender != NULL, NULL);
+
+@@ -223,7 +236,29 @@ gpk_dbus_get_exec_for_sender (GpkDbus *d
+ }
+
+ /* get command line from proc */
++#ifdef __FreeBSD__
++ mib[0] = CTL_KERN;
++ mib[1] = KERN_PROC;
++ mib[2] = KERN_PROC_PATHNAME;
++ mib[3] = pid;
++
++ len = 0;
++
++ error2 = sysctl(mib, 4, NULL, &len, NULL, 0);
++ if (error2) {
++ printf ("Error: %s\n", strerror(error2));
++ goto out;
++ }
++
++ filename = malloc(len);
++ error2 = sysctl(mib, 4, filename, &len, NULL, 0);
++ if (error2) {
++ printf ("Error: %s\n", strerror(error2));
++ goto out;
++ }
++#else
+ filename = g_strdup_printf ("/proc/%i/exe", pid);
++#endif
+ cmdline = g_file_read_link (filename, &error);
+ if (cmdline == NULL) {
+ egg_warning ("failed to find exec: %s", error->message);
diff --git a/ports-mgmt/gnome-packagekit/pkg-plist b/ports-mgmt/gnome-packagekit/pkg-plist
index b998fe705931..fbe981a8c2ad 100644
--- a/ports-mgmt/gnome-packagekit/pkg-plist
+++ b/ports-mgmt/gnome-packagekit/pkg-plist
@@ -389,6 +389,7 @@ share/locale/bg/LC_MESSAGES/gnome-packagekit.mo
share/locale/bn/LC_MESSAGES/gnome-packagekit.mo
share/locale/bn_IN/LC_MESSAGES/gnome-packagekit.mo
share/locale/ca/LC_MESSAGES/gnome-packagekit.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-packagekit.mo
share/locale/cs/LC_MESSAGES/gnome-packagekit.mo
share/locale/cy/LC_MESSAGES/gnome-packagekit.mo
share/locale/da/LC_MESSAGES/gnome-packagekit.mo
@@ -397,6 +398,7 @@ share/locale/el/LC_MESSAGES/gnome-packagekit.mo
share/locale/en@shaw/LC_MESSAGES/gnome-packagekit.mo
share/locale/en_GB/LC_MESSAGES/gnome-packagekit.mo
share/locale/es/LC_MESSAGES/gnome-packagekit.mo
+share/locale/et/LC_MESSAGES/gnome-packagekit.mo
share/locale/fi/LC_MESSAGES/gnome-packagekit.mo
share/locale/fr/LC_MESSAGES/gnome-packagekit.mo
share/locale/gl/LC_MESSAGES/gnome-packagekit.mo
@@ -404,12 +406,15 @@ share/locale/gu/LC_MESSAGES/gnome-packagekit.mo
share/locale/he/LC_MESSAGES/gnome-packagekit.mo
share/locale/hi/LC_MESSAGES/gnome-packagekit.mo
share/locale/hu/LC_MESSAGES/gnome-packagekit.mo
+share/locale/id/LC_MESSAGES/gnome-packagekit.mo
share/locale/it/LC_MESSAGES/gnome-packagekit.mo
share/locale/ja/LC_MESSAGES/gnome-packagekit.mo
share/locale/kn/LC_MESSAGES/gnome-packagekit.mo
share/locale/lt/LC_MESSAGES/gnome-packagekit.mo
+share/locale/lv/LC_MESSAGES/gnome-packagekit.mo
share/locale/ml/LC_MESSAGES/gnome-packagekit.mo
share/locale/mr/LC_MESSAGES/gnome-packagekit.mo
+share/locale/ms/LC_MESSAGES/gnome-packagekit.mo
share/locale/nb/LC_MESSAGES/gnome-packagekit.mo
share/locale/nl/LC_MESSAGES/gnome-packagekit.mo
share/locale/oc/LC_MESSAGES/gnome-packagekit.mo
@@ -450,6 +455,8 @@ share/omf/gnome-packagekit/gnome-packagekit-zh_CN.omf
@dirrmtry share/locale/mr
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/as/LC_MESSAGES
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 167992992ff0..0494299f1e8c 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/security/gnome-keyring/Makefile,v 1.92 2010/04/27 16:51:29 kwm Exp $
+# $MCom: ports-stable/security/gnome-keyring/Makefile,v 1.6 2010/06/23 12:38:25 kwm Exp $
#
PORTNAME= gnome-keyring
-PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTVERSION= 2.30.3
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -29,10 +28,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= gnome-keyring.schemas
-SUB_FILES= org.freedesktop.secrets.service
-
-post-install:
- ${INSTALL_DATA} ${WRKDIR}/org.freedesktop.secrets.service \
- ${PREFIX}/share/dbus-1/services
-
.include <bsd.port.mk>
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 0773b83ba4f8..c87f432564c7 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-2.30.1.tar.bz2) = 41f4d9323c4ad7c58d88348979f7daba
-SHA256 (gnome2/gnome-keyring-2.30.1.tar.bz2) = a76e7e06c3daa44340f8a3a0f3ef4b784973cdddff2d854cb30a3e7950796e5a
-SIZE (gnome2/gnome-keyring-2.30.1.tar.bz2) = 1593050
+MD5 (gnome2/gnome-keyring-2.30.3.tar.bz2) = 54cb1835c02a40f27fda73e58da17cc6
+SHA256 (gnome2/gnome-keyring-2.30.3.tar.bz2) = b24e5c6db621897f2a0045f0083e1f878d617f5c801d389c2ce028a2c67e290b
+SIZE (gnome2/gnome-keyring-2.30.3.tar.bz2) = 1592573
diff --git a/security/gnome-keyring/files/org.freedesktop.secrets.service.in b/security/gnome-keyring/files/org.freedesktop.secrets.service.in
deleted file mode 100644
index 6f3f308b8c6e..000000000000
--- a/security/gnome-keyring/files/org.freedesktop.secrets.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.secrets
-Exec=%%PREFIX%%/bin/gnome-keyring-daemon --start --foreground --components=secrets
diff --git a/security/gnome-keyring/files/patch-daemon_Makefile.in b/security/gnome-keyring/files/patch-daemon_Makefile.in
deleted file mode 100644
index 9ac991927239..000000000000
--- a/security/gnome-keyring/files/patch-daemon_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemon/Makefile.in.orig 2010-05-14 00:25:44.000000000 -0400
-+++ daemon/Makefile.in 2010-05-14 00:25:29.000000000 -0400
-@@ -906,7 +906,7 @@ uninstall-am: uninstall-binPROGRAMS unin
-
-
- # Rule to make the service file with bindir expanded
--$(service_DATA): $(service_in_files) Makefile
-+%.service: %.service.in Makefile
- @sed -e "s|\@PATH\@|$(service_PATH)|" $< > $@
-
- @INTLTOOL_DESKTOP_RULE@
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 645f64681150..abd79c2cdb1a 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,11 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/brasero/Makefile,v 1.71 2010/04/27 20:38:56 kwm Exp $
+# $MCom: ports-stable/sysutils/brasero/Makefile,v 1.3 2010/06/23 15:46:07 kwm Exp $
PORTNAME= brasero
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.30.2
CATEGORIES= sysutils audio multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index 39893f67a966..1010f1a6855a 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/brasero-2.30.1.tar.bz2) = 01c313f02939ee7dd277cafe11a5ef89
-SHA256 (gnome2/brasero-2.30.1.tar.bz2) = 676922e42192f38c82b40b460f896fa4653dd55a336365ace1fa64d9fc441f0e
-SIZE (gnome2/brasero-2.30.1.tar.bz2) = 4310409
+MD5 (gnome2/brasero-2.30.2.tar.bz2) = c1c995a01a087ad1d1062c8ed64405dd
+SHA256 (gnome2/brasero-2.30.2.tar.bz2) = 782b9c35e706fc405bc349d9cb4fab0ec6c64758bcb56a9e86c2899ca02f415b
+SIZE (gnome2/brasero-2.30.2.tar.bz2) = 4460261
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
index c9ba877869f6..679e284b08fe 100644
--- a/sysutils/brasero/pkg-plist
+++ b/sysutils/brasero/pkg-plist
@@ -325,6 +325,8 @@ share/gnome/help/brasero/en_GB/brasero.xml
share/gnome/help/brasero/en_GB/figures/brasero_main.png
share/gnome/help/brasero/es/brasero.xml
share/gnome/help/brasero/es/figures/brasero_main.png
+share/gnome/help/brasero/fi/brasero.xml
+share/gnome/help/brasero/fi/figures/brasero_main.png
share/gnome/help/brasero/fr/brasero.xml
share/gnome/help/brasero/fr/figures/brasero_main.png
share/gnome/help/brasero/it/brasero.xml
@@ -391,6 +393,7 @@ share/locale/mr/LC_MESSAGES/brasero.mo
share/locale/nb/LC_MESSAGES/brasero.mo
share/locale/nds/LC_MESSAGES/brasero.mo
share/locale/nl/LC_MESSAGES/brasero.mo
+share/locale/nn/LC_MESSAGES/brasero.mo
share/locale/oc/LC_MESSAGES/brasero.mo
share/locale/or/LC_MESSAGES/brasero.mo
share/locale/pa/LC_MESSAGES/brasero.mo
@@ -421,6 +424,7 @@ share/omf/brasero/brasero-de.omf
share/omf/brasero/brasero-el.omf
share/omf/brasero/brasero-en_GB.omf
share/omf/brasero/brasero-es.omf
+share/omf/brasero/brasero-fi.omf
share/omf/brasero/brasero-fr.omf
share/omf/brasero/brasero-it.omf
share/omf/brasero/brasero-pl.omf
@@ -446,6 +450,8 @@ share/omf/brasero/brasero-zh_TW.omf
@dirrm share/gnome/help/brasero/it
@dirrm share/gnome/help/brasero/fr/figures
@dirrm share/gnome/help/brasero/fr
+@dirrm share/gnome/help/brasero/fi/figures
+@dirrm share/gnome/help/brasero/fi
@dirrm share/gnome/help/brasero/es/figures
@dirrm share/gnome/help/brasero/es
@dirrm share/gnome/help/brasero/en_GB/figures
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 00f9781f6a02..5ba579156dbd 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.62 2010/04/26 23:24:41 kwm Exp $
+# $MCom: ports-stable/sysutils/gnome-settings-daemon/Makefile,v 1.4 2010/06/23 20:44:39 kwm Exp $
#
PORTNAME= gnome-settings-daemon
-PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTVERSION= 2.30.2
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 7072a4788336..145591482cab 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-settings-daemon-2.30.1.tar.bz2) = 0a287d63b15bda50c344b3fe9a71c47e
-SHA256 (gnome2/gnome-settings-daemon-2.30.1.tar.bz2) = 6f66de1bb80af094a640398549799109e60f53d5373a1b0b7719a5a31c900095
-SIZE (gnome2/gnome-settings-daemon-2.30.1.tar.bz2) = 1246609
+MD5 (gnome2/gnome-settings-daemon-2.30.2.tar.bz2) = b945b1f542167c201a11f0ba1e1a4739
+SHA256 (gnome2/gnome-settings-daemon-2.30.2.tar.bz2) = 7cd22dab52f52900ee13a5bc0c1a186e91d33e77f5333c4622f84d85e4eb71f4
+SIZE (gnome2/gnome-settings-daemon-2.30.2.tar.bz2) = 1250365
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index f745155edd5a..5628f92ce6f4 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.97 2010/04/27 17:44:05 kwm Exp $
+# $MCom: ports-stable/sysutils/gnome-system-tools/Makefile,v 1.1 2010/06/24 08:02:01 kwm Exp $
#
PORTNAME= gnome-system-tools
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.30.2
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index 8fb8a76b1b78..d981283007bf 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-2.30.1.tar.bz2) = d752a0bc2e075ba6d99fbf5d609051cc
-SHA256 (gnome2/gnome-system-tools-2.30.1.tar.bz2) = c70c2282275d54793c65cffe51ad84d2586b13eb49e4c7d4fa94e7d2edbebc70
-SIZE (gnome2/gnome-system-tools-2.30.1.tar.bz2) = 5380453
+MD5 (gnome2/gnome-system-tools-2.30.2.tar.bz2) = 9211516168aa171b34823d8c58c807d4
+SHA256 (gnome2/gnome-system-tools-2.30.2.tar.bz2) = ee5d945a32fe962d3574c073416ee950d770e16a87dec2d51b8d4dd6521e880d
+SIZE (gnome2/gnome-system-tools-2.30.2.tar.bz2) = 5401601
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index 276abf1dd1e3..111857bdc7f4 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -3,12 +3,11 @@
# Whom: FreeBSD GNOME Team
#
# $FreeBSD$
-# $MCom: ports/sysutils/pessulus/Makefile,v 1.28 2010/04/02 04:24:02 avl Exp $
+# $MCom: ports-stable/sysutils/pessulus/Makefile,v 1.3 2010/06/23 20:01:35 kwm Exp $
#
PORTNAME= pessulus
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.30.2
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo
index 4683c78b6953..38102127c821 100644
--- a/sysutils/pessulus/distinfo
+++ b/sysutils/pessulus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pessulus-2.30.0.tar.bz2) = a4a91bd6d554e3a2bb42ce5567d80203
-SHA256 (gnome2/pessulus-2.30.0.tar.bz2) = f735ec84fa179ae7896bcfc100f1ff30c8e135ceee2a8d2f5e7629d3f7454679
-SIZE (gnome2/pessulus-2.30.0.tar.bz2) = 182629
+MD5 (gnome2/pessulus-2.30.2.tar.bz2) = fbcfb402e12af2006918fc4ee4c78285
+SHA256 (gnome2/pessulus-2.30.2.tar.bz2) = c6ff212f8db39fb4a4937b7a85a8b668ebbc4555742b00f3d2d40750c92f8e8e
+SIZE (gnome2/pessulus-2.30.2.tar.bz2) = 181716
diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist
index 15f1ba1ca103..7a1d333456ee 100644
--- a/sysutils/pessulus/pkg-plist
+++ b/sysutils/pessulus/pkg-plist
@@ -75,6 +75,7 @@ share/locale/el/LC_MESSAGES/pessulus.mo
share/locale/en@shaw/LC_MESSAGES/pessulus.mo
share/locale/en_CA/LC_MESSAGES/pessulus.mo
share/locale/en_GB/LC_MESSAGES/pessulus.mo
+share/locale/eo/LC_MESSAGES/pessulus.mo
share/locale/es/LC_MESSAGES/pessulus.mo
share/locale/et/LC_MESSAGES/pessulus.mo
share/locale/eu/LC_MESSAGES/pessulus.mo
@@ -85,6 +86,7 @@ share/locale/gu/LC_MESSAGES/pessulus.mo
share/locale/he/LC_MESSAGES/pessulus.mo
share/locale/hi/LC_MESSAGES/pessulus.mo
share/locale/hu/LC_MESSAGES/pessulus.mo
+share/locale/hy/LC_MESSAGES/pessulus.mo
share/locale/id/LC_MESSAGES/pessulus.mo
share/locale/it/LC_MESSAGES/pessulus.mo
share/locale/ja/LC_MESSAGES/pessulus.mo
@@ -125,6 +127,7 @@ share/locale/te/LC_MESSAGES/pessulus.mo
share/locale/th/LC_MESSAGES/pessulus.mo
share/locale/tr/LC_MESSAGES/pessulus.mo
share/locale/uk/LC_MESSAGES/pessulus.mo
+share/locale/ug/LC_MESSAGES/pessulus.mo
share/locale/uz@cyrillic/LC_MESSAGES/pessulus.mo
share/locale/vi/LC_MESSAGES/pessulus.mo
share/locale/zh_CN/LC_MESSAGES/pessulus.mo
@@ -140,6 +143,8 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -158,6 +163,8 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 71f8907c7620..7a5ad5df8f3e 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/upower/Makefile,v 1.15 2010/05/09 17:43:53 marcus Exp $
+# $MCom: ports-stable/sysutils/upower/Makefile,v 1.1 2010/07/12 14:10:07 kwm Exp $
#
PORTNAME= upower
-PORTVERSION= 0.9.4
-PORTREVISION= 1
+PORTVERSION= 0.9.5
CATEGORIES= sysutils
MASTER_SITES= http://upower.freedesktop.org/releases/
@@ -20,6 +19,8 @@ LIB_DEPENDS= polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
RUN_DEPENDS= ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_GETTEXT= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index 98dcd0b819eb..453b025431ce 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,3 +1,3 @@
-MD5 (upower-0.9.4.tar.bz2) = da93329b0938a64ad55a26aa8ee9c807
-SHA256 (upower-0.9.4.tar.bz2) = 39dd138781b2a2d820f1a2bde4ca60dbf99e6def0e0010d4c3d3f4707954a57c
-SIZE (upower-0.9.4.tar.bz2) = 468727
+MD5 (upower-0.9.5.tar.bz2) = 1c0e5f45345c17fc945dfb365847b587
+SHA256 (upower-0.9.5.tar.bz2) = b34074a5467d442720f4b5d4cee3946fa41dea932463f5e265deb90ae0e7c7a1
+SIZE (upower-0.9.5.tar.bz2) = 473750
diff --git a/sysutils/upower/files/patch-src_freebsd_up-backend.c b/sysutils/upower/files/patch-src_freebsd_up-backend.c
deleted file mode 100644
index f6ad1181572b..000000000000
--- a/sysutils/upower/files/patch-src_freebsd_up-backend.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/freebsd/up-backend.c.orig 2010-05-09 13:40:33.000000000 -0400
-+++ src/freebsd/up-backend.c 2010-05-09 13:42:27.000000000 -0400
-@@ -298,16 +298,6 @@ up_backend_coldplug (UpBackend *backend,
- }
-
- /**
-- * up_backend_get_powersave_command:
-- **/
--const gchar *
--up_backend_get_powersave_command (UpBackend *backend, gboolean powersave)
--{
-- /* XXX: Do we want to use powerd here? */
-- return NULL;
--}
--
--/**
- * up_backend_get_suspend_command:
- **/
- const gchar *
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 1e3806693149..cb0dd50fd1f6 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -3,10 +3,10 @@
# Whom: fenner
#
# $FreeBSD$
-# $MCom: ports/textproc/gtk-doc/Makefile,v 1.8 2010/03/29 04:34:00 avl Exp $
+# $MCom: ports-stable/textproc/gtk-doc/Makefile,v 1.1 2010/06/24 09:20:01 kwm Exp $
PORTNAME= gtk-doc
-PORTVERSION= 1.14
+PORTVERSION= 1.15
CATEGORIES= textproc
MASTER_SITES= GNOME
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
index 58231e0b2ee0..719435d47592 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-doc-1.14.tar.bz2) = 7aa8a1262c70692ebbdf33395fddd5c4
-SHA256 (gtk-doc-1.14.tar.bz2) = a92aa890d35ff9ac152d3a6957dc66d486046c1993538eaf2be13b4d4d089c03
-SIZE (gtk-doc-1.14.tar.bz2) = 785147
+MD5 (gtk-doc-1.15.tar.bz2) = c022788b1fbbec30d55df4ccb34eeb90
+SHA256 (gtk-doc-1.15.tar.bz2) = 59cc73babf0db3a89d1a71f7ef5394a42ec1d3447d3a0a1539057a7b0ce44831
+SIZE (gtk-doc-1.15.tar.bz2) = 787687
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index f5b8b3651d1b..99e32d873233 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.169 2010/04/26 11:21:29 kwm Exp $
+# $MCom: ports-stable/www/gtkhtml3/Makefile,v 1.9 2010/06/22 20:20:38 kwm Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.30.1
-PORTREVISION= 1
+PORTVERSION= 3.30.2
CATEGORIES= www gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index b544e2dc9835..bcd6941fd3f9 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.30.1.tar.bz2) = f858b359511f1e1437ad826f4ce0eda9
-SHA256 (gnome2/gtkhtml-3.30.1.tar.bz2) = 70c8e2bffaff783408b847e54e9bb68f438dcd488721b9597168f88395a8f703
-SIZE (gnome2/gtkhtml-3.30.1.tar.bz2) = 1350166
+MD5 (gnome2/gtkhtml-3.30.2.tar.bz2) = 590c626e507a2ef9c9026699283d4004
+SHA256 (gnome2/gtkhtml-3.30.2.tar.bz2) = 6710d3085e4ae0d71e04f694e7e0abbc46c9c3ea2796143818335e7c38cfe08e
+SIZE (gnome2/gtkhtml-3.30.2.tar.bz2) = 1350044
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index e5684d714693..2de3ff540965 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.178 2010/04/29 12:44:55 kwm Exp $
+# $MCom: ports-stable/x11-themes/gnome-themes/Makefile,v 1.5 2010/06/23 14:17:10 kwm Exp $
#
PORTNAME= gnome-themes
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.30.2
CATEGORIES= x11-themes gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo
index e24cb4d5edc7..ddfac942698e 100644
--- a/x11-themes/gnome-themes/distinfo
+++ b/x11-themes/gnome-themes/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-themes-2.30.1.tar.bz2) = 89828bdb7f50b540e4d90154760638b3
-SHA256 (gnome2/gnome-themes-2.30.1.tar.bz2) = 20c4f9e3c8d16e45e3f15d4fcacf45cb59a8cd6124798828387ba6c04ec75c3e
-SIZE (gnome2/gnome-themes-2.30.1.tar.bz2) = 1643074
+MD5 (gnome2/gnome-themes-2.30.2.tar.bz2) = a14d46ac59f651e04a333ae1dff23848
+SHA256 (gnome2/gnome-themes-2.30.2.tar.bz2) = b7efbeb429ad19003cc26c468597cef42f5b5570d819af51828efbaa441682d5
+SIZE (gnome2/gnome-themes-2.30.2.tar.bz2) = 1643197
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index 7b3876e3f04f..ccbe20ffa6a4 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -670,6 +670,7 @@ share/icons/HighContrast-SVG/scalable/apps/accessories-calculator.svg
share/icons/HighContrast-SVG/scalable/apps/accessories-character-map.svg
share/icons/HighContrast-SVG/scalable/apps/accessories-text-editor.svg
share/icons/HighContrast-SVG/scalable/apps/arts.svg
+share/icons/HighContrast-SVG/scalable/apps/brasero.svg
share/icons/HighContrast-SVG/scalable/apps/bug-buddy.svg
share/icons/HighContrast-SVG/scalable/apps/calc.svg
share/icons/HighContrast-SVG/scalable/apps/config-language.svg
@@ -712,12 +713,15 @@ share/icons/HighContrast-SVG/scalable/apps/preferences-system-network-proxy.svg
share/icons/HighContrast-SVG/scalable/apps/preferences-system-session.svg
share/icons/HighContrast-SVG/scalable/apps/preferences-system-windows.svg
share/icons/HighContrast-SVG/scalable/apps/redhat-filemanager.svg
+share/icons/HighContrast-SVG/scalable/apps/rhythmbox.svg
share/icons/HighContrast-SVG/scalable/apps/screensaver.svg
+share/icons/HighContrast-SVG/scalable/apps/sound-juicer.svg
share/icons/HighContrast-SVG/scalable/apps/susehelpcenter.svg
share/icons/HighContrast-SVG/scalable/apps/system-file-manager.svg
share/icons/HighContrast-SVG/scalable/apps/terminal.svg
share/icons/HighContrast-SVG/scalable/apps/text-editor.svg
share/icons/HighContrast-SVG/scalable/apps/tomboy.svg
+share/icons/HighContrast-SVG/scalable/apps/totem.svg
share/icons/HighContrast-SVG/scalable/apps/utilities-system-monitor.svg
share/icons/HighContrast-SVG/scalable/apps/utilities-terminal.svg
share/icons/HighContrast-SVG/scalable/apps/volume-knob.svg
@@ -1184,12 +1188,14 @@ share/icons/HighContrastLargePrint/48x48/apps/access.png
share/icons/HighContrastLargePrint/48x48/apps/accessibility-directory.png
share/icons/HighContrastLargePrint/48x48/apps/accessories-calculator.png
share/icons/HighContrastLargePrint/48x48/apps/accessories-character-map.png
+share/icons/HighContrastLargePrint/48x48/apps/accessories-dictionary.png
share/icons/HighContrastLargePrint/48x48/apps/accessories-text-editor.png
share/icons/HighContrastLargePrint/48x48/apps/advanced-directory.png
share/icons/HighContrastLargePrint/48x48/apps/applets-screenshooter.png
share/icons/HighContrastLargePrint/48x48/apps/arts.png
share/icons/HighContrastLargePrint/48x48/apps/ax-applet.png
share/icons/HighContrastLargePrint/48x48/apps/background.png
+share/icons/HighContrastLargePrint/48x48/apps/brasero.png
share/icons/HighContrastLargePrint/48x48/apps/calc.png
share/icons/HighContrastLargePrint/48x48/apps/charpick.png
share/icons/HighContrastLargePrint/48x48/apps/clock.png
@@ -1200,8 +1206,8 @@ share/icons/HighContrastLargePrint/48x48/apps/evince.png
share/icons/HighContrastLargePrint/48x48/apps/evolution.png
share/icons/HighContrastLargePrint/48x48/apps/file-manager.png
share/icons/HighContrastLargePrint/48x48/apps/file-roller.png
+share/icons/HighContrastLargePrint/48x48/apps/firefox-icon.png
share/icons/HighContrastLargePrint/48x48/apps/fonts.png
-share/icons/HighContrastLargePrint/48x48/apps/gdict.png
share/icons/HighContrastLargePrint/48x48/apps/ghex.png
share/icons/HighContrastLargePrint/48x48/apps/gimp.png
share/icons/HighContrastLargePrint/48x48/apps/gkb.png
@@ -1224,6 +1230,7 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-mailcheck.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-mini-commander.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer-applet.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-monitor.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-panel.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool-animation-rest.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool-animation.png
@@ -1255,6 +1262,7 @@ share/icons/HighContrastLargePrint/48x48/apps/kfm.png
share/icons/HighContrastLargePrint/48x48/apps/khelpcenter.png
share/icons/HighContrastLargePrint/48x48/apps/knotify.png
share/icons/HighContrastLargePrint/48x48/apps/konsole.png
+share/icons/HighContrastLargePrint/48x48/apps/ksysguard.png
share/icons/HighContrastLargePrint/48x48/apps/kwin.png
share/icons/HighContrastLargePrint/48x48/apps/launcher-program.png
share/icons/HighContrastLargePrint/48x48/apps/locale.png
@@ -1277,6 +1285,7 @@ share/icons/HighContrastLargePrint/48x48/apps/preferences-desktop-wallpaper.png
share/icons/HighContrastLargePrint/48x48/apps/preferences-system-session.png
share/icons/HighContrastLargePrint/48x48/apps/preferences-system-windows.png
share/icons/HighContrastLargePrint/48x48/apps/redhat-filemanager.png
+share/icons/HighContrastLargePrint/48x48/apps/rhythmbox.png
share/icons/HighContrastLargePrint/48x48/apps/session-properties.png
share/icons/HighContrastLargePrint/48x48/apps/smc.png
share/icons/HighContrastLargePrint/48x48/apps/sound-juicer.png
@@ -1286,6 +1295,8 @@ share/icons/HighContrastLargePrint/48x48/apps/susehelpcenter.png
share/icons/HighContrastLargePrint/48x48/apps/system-file-manager.png
share/icons/HighContrastLargePrint/48x48/apps/terminal.png
share/icons/HighContrastLargePrint/48x48/apps/text-editor.png
+share/icons/HighContrastLargePrint/48x48/apps/totem.png
+share/icons/HighContrastLargePrint/48x48/apps/utilities-system-monitor.png
share/icons/HighContrastLargePrint/48x48/apps/utilities-terminal.png
share/icons/HighContrastLargePrint/48x48/apps/volume-knob.png
share/icons/HighContrastLargePrint/48x48/apps/wallpaper.png
@@ -1638,12 +1649,14 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/access.png
share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-directory.png
share/icons/HighContrastLargePrintInverse/48x48/apps/accessories-calculator.png
share/icons/HighContrastLargePrintInverse/48x48/apps/accessories-character-map.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/accessories-dictionary.png
share/icons/HighContrastLargePrintInverse/48x48/apps/accessories-text-editor.png
share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png
share/icons/HighContrastLargePrintInverse/48x48/apps/applets-screenshooter.png
share/icons/HighContrastLargePrintInverse/48x48/apps/arts.png
share/icons/HighContrastLargePrintInverse/48x48/apps/ax-applet.png
share/icons/HighContrastLargePrintInverse/48x48/apps/background.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/brasero.png
share/icons/HighContrastLargePrintInverse/48x48/apps/calc.png
share/icons/HighContrastLargePrintInverse/48x48/apps/charpick.png
share/icons/HighContrastLargePrintInverse/48x48/apps/clock.png
@@ -1654,8 +1667,8 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/evince.png
share/icons/HighContrastLargePrintInverse/48x48/apps/evolution.png
share/icons/HighContrastLargePrintInverse/48x48/apps/file-manager.png
share/icons/HighContrastLargePrintInverse/48x48/apps/file-roller.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/firefox-icon.png
share/icons/HighContrastLargePrintInverse/48x48/apps/fonts.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/gdict.png
share/icons/HighContrastLargePrintInverse/48x48/apps/ghex.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gimp.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gkb.png
@@ -1678,6 +1691,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mailcheck.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mini-commander.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer-applet.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-monitor.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-panel.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation-rest.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation.png
@@ -1709,6 +1723,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/kfm.png
share/icons/HighContrastLargePrintInverse/48x48/apps/khelpcenter.png
share/icons/HighContrastLargePrintInverse/48x48/apps/knotify.png
share/icons/HighContrastLargePrintInverse/48x48/apps/konsole.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/ksysguard.png
share/icons/HighContrastLargePrintInverse/48x48/apps/kwin.png
share/icons/HighContrastLargePrintInverse/48x48/apps/launcher-program.png
share/icons/HighContrastLargePrintInverse/48x48/apps/locale.png
@@ -1731,6 +1746,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-wallpap
share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-system-session.png
share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-system-windows.png
share/icons/HighContrastLargePrintInverse/48x48/apps/redhat-filemanager.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/rhythmbox.png
share/icons/HighContrastLargePrintInverse/48x48/apps/session-properties.png
share/icons/HighContrastLargePrintInverse/48x48/apps/smc.png
share/icons/HighContrastLargePrintInverse/48x48/apps/sound-juicer.png
@@ -1740,6 +1756,8 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/susehelpcenter.png
share/icons/HighContrastLargePrintInverse/48x48/apps/system-file-manager.png
share/icons/HighContrastLargePrintInverse/48x48/apps/terminal.png
share/icons/HighContrastLargePrintInverse/48x48/apps/text-editor.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/totem.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/utilities-system-monitor.png
share/icons/HighContrastLargePrintInverse/48x48/apps/utilities-terminal.png
share/icons/HighContrastLargePrintInverse/48x48/apps/volume-knob.png
share/icons/HighContrastLargePrintInverse/48x48/apps/wallpaper.png
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 8464cf092bbc..640c8d3e7724 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.91 2010/04/26 20:58:21 kwm Exp $
+# $MCom: ports-stable/x11-toolkits/gtksourceview2/Makefile,v 1.3 2010/06/23 11:44:45 kwm Exp $
#
PORTNAME= gtksourceview2
-PORTVERSION= 2.10.3
+PORTVERSION= 2.10.4
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo
index edd207d853f0..37debe302fc4 100644
--- a/x11-toolkits/gtksourceview2/distinfo
+++ b/x11-toolkits/gtksourceview2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtksourceview-2.10.3.tar.bz2) = 50211064d49f2689645b7895083e3828
-SHA256 (gnome2/gtksourceview-2.10.3.tar.bz2) = 4657d680ef2648d1068cd2b5a8cc42254c1f1119aca4db8f679b78e363bd88f6
-SIZE (gnome2/gtksourceview-2.10.3.tar.bz2) = 1230050
+MD5 (gnome2/gtksourceview-2.10.4.tar.bz2) = 342666cba9eb2643e5166a0cb58203d2
+SHA256 (gnome2/gtksourceview-2.10.4.tar.bz2) = 54f243cf6d55f8d75d910b05374c6b33c9bd66b9c05e781ed565275e0bcad741
+SIZE (gnome2/gtksourceview-2.10.4.tar.bz2) = 1232741
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index c6a0391e57d5..4f9ff1efd012 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgail-gnome/Makefile,v 1.24 2010/04/01 13:23:49 kwm Exp $
+# $MCom: ports-stable/x11-toolkits/libgail-gnome/Makefile,v 1.1 2010/06/23 12:27:01 kwm Exp $
#
PORTNAME= libgail-gnome
-PORTVERSION= 1.20.2
+PORTVERSION= 1.20.3
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -26,5 +26,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
PLIST_FILES= lib/gtk-2.0/modules/libgail-gnome.la \
lib/gtk-2.0/modules/libgail-gnome.so \
libdata/pkgconfig/libgail-gnome.pc
+GCONF_SCHEMAS= libgail-gnome.schemas
.include <bsd.port.mk>
diff --git a/x11-toolkits/libgail-gnome/distinfo b/x11-toolkits/libgail-gnome/distinfo
index 05d3a402416f..d551ce9c3e08 100644
--- a/x11-toolkits/libgail-gnome/distinfo
+++ b/x11-toolkits/libgail-gnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgail-gnome-1.20.2.tar.bz2) = b58d4f6903e4d5c8b01c6694b41c5a22
-SHA256 (gnome2/libgail-gnome-1.20.2.tar.bz2) = 28efea7aaa7351735129b851214ffc6a8595fae9c4fd0967b1bbfb6553d27382
-SIZE (gnome2/libgail-gnome-1.20.2.tar.bz2) = 245266
+MD5 (gnome2/libgail-gnome-1.20.3.tar.bz2) = 11fde9cc917c2572c87bfda10cc52751
+SHA256 (gnome2/libgail-gnome-1.20.3.tar.bz2) = 941f47ceaaebb508f66247639051d233284d93f3f42a76284a9f8d1c0ba09a22
+SIZE (gnome2/libgail-gnome-1.20.3.tar.bz2) = 235616
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 720a5c268412..f054b90364ef 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.128 2010/04/02 03:07:33 avl Exp $
+# $MCom: ports-stable/x11-toolkits/libwnck/Makefile,v 1.5 2010/06/23 20:05:15 kwm Exp $
#
PORTNAME= libwnck
-PORTVERSION= 2.30.0
-PORTREVISION?= 1
+PORTVERSION= 2.30.2
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 31d17586a03a..c497b01c8d8c 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libwnck-2.30.0.tar.bz2) = ed79955dabb606ee0e6d112a291005ad
-SHA256 (gnome2/libwnck-2.30.0.tar.bz2) = d35bcc28548945915da4f5cafd0555606f972e236cc5f9dbb0186186dfbf5247
-SIZE (gnome2/libwnck-2.30.0.tar.bz2) = 705602
+MD5 (gnome2/libwnck-2.30.2.tar.bz2) = f58a82c97cc1dd95d9c56bbef3649a92
+SHA256 (gnome2/libwnck-2.30.2.tar.bz2) = 41e376df894d81df7daa6131dce7114ffd15b7da357fbeadd031d6d6ecfc443d
+SIZE (gnome2/libwnck-2.30.2.tar.bz2) = 707701
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 3a2ee65c80ef..d0e7f8ca007d 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -28,6 +28,7 @@ share/locale/be@latin/LC_MESSAGES/libwnck.mo
share/locale/bg/LC_MESSAGES/libwnck.mo
share/locale/bn/LC_MESSAGES/libwnck.mo
share/locale/bn_IN/LC_MESSAGES/libwnck.mo
+share/locale/br/LC_MESSAGES/libwnck.mo
share/locale/bs/LC_MESSAGES/libwnck.mo
share/locale/ca/LC_MESSAGES/libwnck.mo
share/locale/ca@valencia/LC_MESSAGES/libwnck.mo
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index b09c487e28b8..192c081f6c43 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/pango/Makefile,v 1.154 2010/04/01 12:08:27 kwm Exp $
+# $MCom: ports-stable/x11-toolkits/pango/Makefile,v 1.9 2010/06/23 22:34:21 kwm Exp $
#
PORTNAME= pango
-PORTVERSION= 1.28.0
-PORTREVISION?= 1
+PORTVERSION= 1.28.1
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME \
ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 10f84879f6ae..27a809b6fa86 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.28.0.tar.bz2) = 545ae8becf7ed74008120f96f4b095f4
-SHA256 (gnome2/pango-1.28.0.tar.bz2) = 68480485b714e3570a58c270add9e9785fa78068f7410949b478e8a9d3f5bc40
-SIZE (gnome2/pango-1.28.0.tar.bz2) = 1500538
+MD5 (gnome2/pango-1.28.1.tar.bz2) = bab5b4eb3fde6b0a5bfe98d25e668741
+SHA256 (gnome2/pango-1.28.1.tar.bz2) = 8f3eaab506f613dd25bb1fa65ea87a145d523d066d90c227bdb3016523451bc2
+SIZE (gnome2/pango-1.28.1.tar.bz2) = 1483961
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index b3a4995cde01..b463e1a77ed1 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.99 2010/04/04 09:58:25 kwm Exp $
+# $MCom: ports-stable/x11-toolkits/py-gnome-desktop/Makefile,v 1.2 2010/06/24 10:03:55 kwm Exp $
#
PORTNAME= gnome-desktop
-PORTVERSION= 2.30.0
-PORTREVISION= 2
+PORTVERSION= 2.30.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,7 +23,7 @@ BUILD_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
- gnome-keyring:${PORTSDIR}/security/gnome-keyring \
+ gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
brasero-media.2:${PORTSDIR}/sysutils/brasero \
evdocument.2:${PORTSDIR}/graphics/evince
RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index 0bf947c661ae..15c9456624f9 100644
--- a/x11-toolkits/py-gnome-desktop/distinfo
+++ b/x11-toolkits/py-gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-desktop-2.30.0.tar.bz2) = a6d448d46a6b3062ce7a1b6a9fddfb48
-SHA256 (gnome2/gnome-python-desktop-2.30.0.tar.bz2) = db997a3c81967d6dc7210dd83e06f18ac6417f804f672e42f15a1d68af371f49
-SIZE (gnome2/gnome-python-desktop-2.30.0.tar.bz2) = 621785
+MD5 (gnome2/gnome-python-desktop-2.30.2.tar.bz2) = b90f6e96a6321e7bf859f6faff2aa4df
+SHA256 (gnome2/gnome-python-desktop-2.30.2.tar.bz2) = 23aa8dbae4bd3d00a5da1eae9500ba3787af4ad0481073ea53e5bff824bbcebb
+SIZE (gnome2/gnome-python-desktop-2.30.2.tar.bz2) = 598305
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index d21a7eca02cd..b2b0c2907d3a 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.174 2010/04/27 14:58:59 kwm Exp $
+# $MCom: ports-stable/x11/gdm/Makefile,v 1.10 2010/07/21 13:50:45 kwm Exp $
#
PORTNAME= gdm
-PORTVERSION= 2.30.2
-PORTREVISION= 1
+PORTVERSION= 2.30.4
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 0081bb351e9f..b871a351917e 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.30.2.tar.bz2) = ba35f9f750b50be572952195989df2c5
-SHA256 (gnome2/gdm-2.30.2.tar.bz2) = 884f4816a78f8f1eece8f1468f19dc01c5350d4a3513d3c0e854f45f870c1ec5
-SIZE (gnome2/gdm-2.30.2.tar.bz2) = 2381359
+MD5 (gnome2/gdm-2.30.4.tar.bz2) = f5e0ff54522f005d7593ac6686772988
+SHA256 (gnome2/gdm-2.30.4.tar.bz2) = 3a1c7fd590622d5291584d98ce5cf3e7888adf949655041549561f3a5983b5a9
+SIZE (gnome2/gdm-2.30.4.tar.bz2) = 2402222
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index d4f41552daa5..b897fa8b7597 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
#!/bin/sh
# $FreeBSD$
-# $MCom: ports/x11/gdm/files/gdm.in,v 1.43 2010/04/17 19:06:00 marcus Exp $
+# $MCom: ports-stable/x11/gdm/files/gdm.in,v 1.5 2010/07/21 13:50:46 kwm Exp $
# PROVIDE: gdm
# REQUIRE: LOGIN cleanvar moused syscons dbus
diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in
index 3f9ebd29b37a..52ad31672ad8 100644
--- a/x11/gdm/files/gdm.pam.in
+++ b/x11/gdm/files/gdm.pam.in
@@ -1,6 +1,6 @@
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/files/gdm.pam.in,v 1.11 2010/03/16 19:33:11 mezz Exp $
+# $MCom: ports-stable/x11/gdm/files/gdm.pam.in,v 1.3 2010/07/21 13:50:46 kwm Exp $
#
# PAM configuration for the "gdm" service
#
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
index b0b8ed37d060..a7bfbc883da0 100644
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
@@ -1,6 +1,6 @@
---- gui/simple-greeter/gdm-user-manager.c.orig 2009-12-21 17:36:30.000000000 +0100
-+++ gui/simple-greeter/gdm-user-manager.c 2009-12-27 22:34:26.000000000 +0100
-@@ -66,6 +66,8 @@
+--- gui/simple-greeter/gdm-user-manager.c.orig 2010-06-26 00:09:31.000000000 +0200
++++ gui/simple-greeter/gdm-user-manager.c 2010-07-20 23:23:07.000000000 +0200
+@@ -62,6 +62,8 @@
#ifdef __sun
#define DEFAULT_MINIMAL_UID 100
@@ -9,19 +9,12 @@
#else
#define DEFAULT_MINIMAL_UID 500
#endif
-@@ -1414,17 +1416,24 @@ reload_passwd (GdmUserManager *manager)
- GSList *new_users;
- GSList *list;
- GSList *dup;
-+#ifndef __FreeBSD__
- FILE *fp;
-+#endif
-
- old_users = NULL;
- new_users = NULL;
+@@ -1678,12 +1680,17 @@ reload_passwd_file (GHashTable *valid_sh
+ NULL,
+ g_object_unref);
+#ifdef __FreeBSD__
-+ setpwent ();
++ setpwent ();
+#else
+
errno = 0;
@@ -32,25 +25,25 @@
}
+#endif
- g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users);
- g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
-@@ -1443,9 +1452,15 @@ reload_passwd (GdmUserManager *manager)
- } else {
+ /* Make sure we keep users who are logged in no matter what. */
+ g_hash_table_iter_init (&iter, current_users_by_name);
+@@ -1733,9 +1740,15 @@ reload_passwd_file (GHashTable *valid_sh
+
g_debug ("GdmUserManager: include_all is TRUE");
+#ifdef __FreeBSD__
+ for (pwent = getpwent ();
+ pwent != NULL;
-+ pwent = getpwent()) {
++ pwent = getpwent ()) {
+#else
for (pwent = fgetpwent (fp);
pwent != NULL;
pwent = fgetpwent (fp)) {
+#endif
- GdmUser *user;
- user = NULL;
-@@ -1521,7 +1536,11 @@ reload_passwd (GdmUserManager *manager)
+ /* Skip users below MinimalUID... */
+ if (pwent->pw_uid < DEFAULT_MINIMAL_UID) {
+@@ -1810,7 +1823,11 @@ reload_passwd_file (GHashTable *valid_sh
out:
/* Cleanup */
@@ -60,5 +53,5 @@
fclose (fp);
+#endif
- g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
- g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);
+ g_hash_table_iter_init (&iter, new_users_by_name);
+ while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &user)) {
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index 376987eda0e9..37802feab918 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -23,12 +23,12 @@ POST-INSTALL)
${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm
${CHMOD} 0755 ${PKG_PREFIX}/share/gdm
${MKDIR} -p ${PKG_PREFIX}/etc/gdm/home
- ${CHOWN} root:${GROUP} ${PKG_PREFIX}/etc/gdm/home
+ ${CHOWN} ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home
${CHMOD} 1770 ${PKG_PREFIX}/etc/gdm/home
install -o root -g wheel -m 444 ${PKG_PREFIX}/share/gdm/gconf.path ${PKG_PREFIX}/etc/gdm/home/.gconf.path
gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --recursive-unset /
gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --load ${PKG_PREFIX}/share/gdm/session-setup.entries
- ${CHOWN} -R root:gdm ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
+ ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
${CHMOD} 1750 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
${CHMOD} 1640 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory/*.xml
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 97705242ebaf..2638d7a283ed 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -24,9 +24,6 @@ libexec/gdm-user-switch-applet
libexec/gdm-xdmcp-chooser-slave
sbin/gdm
sbin/gdm-binary
-sbin/gdm-restart
-sbin/gdm-safe-restart
-sbin/gdm-stop
%%DATADIR%%/autostart/LoginWindow/at-spi-registryd-wrapper.desktop
%%DATADIR%%/autostart/LoginWindow/gdm-simple-greeter.desktop
%%DATADIR%%/autostart/LoginWindow/gnome-mag.desktop
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 5ee4c4b082c7..cd1be1754099 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-desktop/Makefile,v 1.180 2010/04/01 12:13:55 kwm Exp $
+# $MCom: ports-stable/x11/gnome-desktop/Makefile,v 1.5 2010/06/23 19:15:14 kwm Exp $
#
PORTNAME= gnome-desktop
-PORTVERSION= 2.30.0
+PORTVERSION= 2.30.2
PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 325c42dd908f..71da28feed6c 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-desktop-2.30.0.tar.bz2) = 211818d93cd1b5b54b880520fe5444c4
-SHA256 (gnome2/gnome-desktop-2.30.0.tar.bz2) = cb80b676966127d8ee1a9b5ebbed1c23646d62ecdfccbb46d40f59633b4b127f
-SIZE (gnome2/gnome-desktop-2.30.0.tar.bz2) = 1632686
+MD5 (gnome2/gnome-desktop-2.30.2.tar.bz2) = 49f06f91b0579c6e5a07ff8195945629
+SHA256 (gnome2/gnome-desktop-2.30.2.tar.bz2) = 089c672cd70617541a9e4a827467af43266357e0c3635fc875b86b9b902084d8
+SIZE (gnome2/gnome-desktop-2.30.2.tar.bz2) = 1665808
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index aaf5dddcd5d3..b944b214c44f 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-menus/Makefile,v 1.105 2010/04/02 01:36:17 avl Exp $
+# $MCom: ports-stable/x11/gnome-menus/Makefile,v 1.9 2010/06/23 19:26:18 kwm Exp $
#
PORTNAME= gnome-menus
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.30.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index e2d254ba7912..eec8ec568c99 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.30.0.tar.bz2) = 423040cfaf099d65406c405cffd9e409
-SHA256 (gnome2/gnome-menus-2.30.0.tar.bz2) = 6c390f88914712e1de425b9a2579f34b0cf27917521e9eb363b0c7cf120fe976
-SIZE (gnome2/gnome-menus-2.30.0.tar.bz2) = 469065
+MD5 (gnome2/gnome-menus-2.30.2.tar.bz2) = 5ca9935f50c939881689c48f59348426
+SHA256 (gnome2/gnome-menus-2.30.2.tar.bz2) = 3cfb41586cda5892aea929ff9b327cbabc37a15971fdc6c6d4334d2488bb3233
+SIZE (gnome2/gnome-menus-2.30.2.tar.bz2) = 464086
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index a89f299b7ae3..ff466cc19618 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -34,6 +34,7 @@ share/desktop-directories/X-GNOME-Other.directory
share/gir-1.0/GMenu-2.0.gir
share/gnome-menus/examples/gnome-menus-ls.py
share/locale/af/LC_MESSAGES/gnome-menus.mo
+share/locale/an/LC_MESSAGES/gnome-menus.mo
share/locale/ar/LC_MESSAGES/gnome-menus.mo
share/locale/as/LC_MESSAGES/gnome-menus.mo
share/locale/ast/LC_MESSAGES/gnome-menus.mo
@@ -203,3 +204,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 6cb5408a7bdf..7743234c5e4f 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-panel/Makefile,v 1.217 2010/04/02 05:35:38 avl Exp $
+# $MCom: ports-stable/x11/gnome-panel/Makefile,v 1.5 2010/06/23 21:59:12 kwm Exp $
#
PORTNAME= gnome-panel
-PORTVERSION= 2.30.0
-PORTREVISION?= 1
+PORTVERSION= 2.30.2
+PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index e1b1501633f3..210adb38c35b 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.30.0.tar.bz2) = e17f25417b2c9011ed1c3ebd75706de6
-SHA256 (gnome2/gnome-panel-2.30.0.tar.bz2) = 7e8f99d3105bc0dda038b5859ab56d0a9740e244d7853786f1deb2df0a692220
-SIZE (gnome2/gnome-panel-2.30.0.tar.bz2) = 3072146
+MD5 (gnome2/gnome-panel-2.30.2.tar.bz2) = 11b6db12223c70a218a2f4602b1683cc
+SHA256 (gnome2/gnome-panel-2.30.2.tar.bz2) = f0171c55ecdf4970f819cce66de0db99bbe43832e8a284ea0dd0c89d7d12e7b6
+SIZE (gnome2/gnome-panel-2.30.2.tar.bz2) = 3125757
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 1a1b440832bd..2db2990f916e 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-session/Makefile,v 1.181 2010/04/02 17:25:12 kwm Exp $
+# $MCom: ports-stable/x11/gnome-session/Makefile,v 1.6 2010/06/24 10:03:55 kwm Exp $
#
PORTNAME= gnome-session
-PORTVERSION= 2.30.0
+PORTVERSION= 2.30.2
PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME \
@@ -22,7 +22,7 @@ COMMENT= Session component for the GNOME 2 desktop
BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
+ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
notify.1:${PORTSDIR}/devel/libnotify \
execinfo:${PORTSDIR}/devel/libexecinfo \
upower-glib.1:${PORTSDIR}/sysutils/upower
@@ -33,7 +33,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gno
INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_XORG= ice sm xau xrandr
+USE_XORG= ice sm xau xext xrandr
USE_GNOME= gnomeprefix gnomehack intlhack gconf2
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 8d32bec92179..cf107957e7e9 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.30.0.tar.bz2) = d15fdd120f3c7d01e4a388a4a0e73932
-SHA256 (gnome2/gnome-session-2.30.0.tar.bz2) = efeb45319403546fa60e6cb035e4de5e87731ea672fd37635749af49d0fd4d84
-SIZE (gnome2/gnome-session-2.30.0.tar.bz2) = 827745
+MD5 (gnome2/gnome-session-2.30.2.tar.bz2) = d93a2da931ac0b9c0d98f6b68a17a730
+SHA256 (gnome2/gnome-session-2.30.2.tar.bz2) = ea7b5d8b254eba0f4ee5f737ed3686fca4fa734ad54a20f206534241f6aef4ec
+SIZE (gnome2/gnome-session-2.30.2.tar.bz2) = 817580
MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5
SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508
SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index d321312070c3..16e39bc24606 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-terminal/Makefile,v 1.132 2010/04/28 02:58:55 mezz Exp $
+# $MCom: ports-stable/x11/gnome-terminal/Makefile,v 1.5 2010/06/23 15:06:11 kwm Exp $
#
PORTNAME= gnome-terminal
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.30.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -31,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= gnome-terminal.schemas
-post-patch:
- @${TOUCH} -f ${WRKSRC}/aclocal.m4
+post-configure:
+ @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
.include <bsd.port.mk>
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 5f3e251d1b1a..8312385db372 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-terminal-2.30.1.tar.bz2) = fed3235a053ce34a16218bfe1c2202ca
-SHA256 (gnome2/gnome-terminal-2.30.1.tar.bz2) = 6f30ff97c0798dbfdc8e0910427d88d1d210b8b63f3d0a238a3d48ef2a280cd7
-SIZE (gnome2/gnome-terminal-2.30.1.tar.bz2) = 2250757
+MD5 (gnome2/gnome-terminal-2.30.2.tar.bz2) = 74c4528f00067072c2bd867d1f8fe844
+SHA256 (gnome2/gnome-terminal-2.30.2.tar.bz2) = 2c7af2250698b9f9f53c6eaa93211c1118cf2c7e29cbbacfd1e8a6a10069e07a
+SIZE (gnome2/gnome-terminal-2.30.2.tar.bz2) = 2250070
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 4f7e2cccc145..24f846db9ced 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2/Makefile,v 1.292 2010/04/30 13:38:35 kwm Exp $
+# $MCom: ports-stable/x11/gnome2/Makefile,v 1.9 2010/06/24 12:38:52 kwm Exp $
#
PORTNAME= gnome2
-PORTVERSION= 2.30.1
-PORTREVISION?= 1
+PORTVERSION= 2.30.2
+PORTREVISION?= 0
CATEGORIES?= x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index df4416bbb054..786e98354497 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnomekbd/Makefile,v 1.42 2010/04/24 01:36:37 marcus Exp $
+# $MCom: ports-stable/x11/libgnomekbd/Makefile,v 1.1 2010/06/23 21:37:12 kwm Exp $
#
PORTNAME= libgnomekbd
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.30.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index 20a1c01a0ae9..75e3e64135d1 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomekbd-2.30.1.tar.bz2) = 9b828a4e35089d91b9ea16ddf981ff28
-SHA256 (gnome2/libgnomekbd-2.30.1.tar.bz2) = 828faade8ef36f89cc27ca4f71e83630aa611ccb4745cb6687cdedddd461b293
-SIZE (gnome2/libgnomekbd-2.30.1.tar.bz2) = 404828
+MD5 (gnome2/libgnomekbd-2.30.2.tar.bz2) = 2fe73ebfd40801655e0aa3f85cefa873
+SHA256 (gnome2/libgnomekbd-2.30.2.tar.bz2) = 3270d8470f5bd4d7e867f22330180a4429ae0f1d685db0bfa4c126699309e1a6
+SIZE (gnome2/libgnomekbd-2.30.2.tar.bz2) = 405388