aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--accessibility/orca/Makefile3
-rw-r--r--accessibility/orca/distinfo6
-rw-r--r--accessibility/orca/files/patch-src_orca_orca.in17
-rw-r--r--accessibility/orca/pkg-plist2
-rw-r--r--x11/gnome-desktop/Makefile5
-rw-r--r--x11/gnome-desktop/distinfo6
-rw-r--r--x11/gnome-desktop/pkg-plist4
7 files changed, 21 insertions, 22 deletions
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index aeffa52143b9..528b720d0120 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= orca
-PORTVERSION= 2.22.1
-PORTREVISION= 1
+PORTVERSION= 2.22.2
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index 2946e2ca88e8..eab0357b99bb 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/orca-2.22.1.tar.bz2) = ef477a5b43846060ccbc636f5b731f21
-SHA256 (gnome2/orca-2.22.1.tar.bz2) = f979254f444d19549413f92de9ae2c8f85c1de059ca1e3a7c66864ee90e73fa9
-SIZE (gnome2/orca-2.22.1.tar.bz2) = 1800378
+MD5 (gnome2/orca-2.22.2.tar.bz2) = f11ff55cc997055b2c5fd9e5c012ae5d
+SHA256 (gnome2/orca-2.22.2.tar.bz2) = aa81f2c22edc382468b9f083dabaf426cce0bc19e584edfc739633bb32f83aba
+SIZE (gnome2/orca-2.22.2.tar.bz2) = 1802526
diff --git a/accessibility/orca/files/patch-src_orca_orca.in b/accessibility/orca/files/patch-src_orca_orca.in
index 45218dd7615e..ec31af2bc8c3 100644
--- a/accessibility/orca/files/patch-src_orca_orca.in
+++ b/accessibility/orca/files/patch-src_orca_orca.in
@@ -1,5 +1,5 @@
---- src/orca/orca.in.orig 2008-05-01 16:52:27.000000000 -0500
-+++ src/orca/orca.in 2008-05-01 16:57:15.000000000 -0500
+--- src/orca/orca.in.orig 2008-05-26 16:22:08.000000000 -0500
++++ src/orca/orca.in 2008-05-26 16:25:53.000000000 -0500
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
@@ -42,12 +42,15 @@
then
cleanup
else
-@@ -270,7 +270,7 @@
+@@ -270,9 +270,9 @@
# erroneously types an illegal command line argument, the
# help text is emitted and the other orca is not killed.
#
-- if [ `egrep -c "\-s|\-g|\-t|\-n|\-u|\-e|\-d" <<< $ARGS` -eq 0 ]
-+ if [ `echo $ARGS | egrep -c "\-s|\-g|\-t|\-n|\-u|\-e|\-d"` -eq 0 ]
+- if [ `egrep -c "\-s|\-g|\-n|\-u|\-e|\-d" <<< $ARGS` -eq 0 ]
++ if [ `echo $ARGS | egrep -c "\-s|\-g|\-n|\-u|\-e|\-d"` -eq 0 ]
then
- runOrca "NO_CLEANUP"
- else
+- if [ `egrep -c "\-t" <<< $ARGS` -eq 0 ]
++ if [ `echo $ARGS | egrep -c "\-t"` -eq 0 ]
+ then
+ runOrca "NO_CLEANUP"
+ else
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index e9897f95325a..0d194b6cbfff 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -310,8 +310,6 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 8cebfeada6d7..1ef2fe1d31b6 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -7,11 +7,10 @@
#
PORTNAME= gnome-desktop
-PORTVERSION= 2.22.1
+PORTVERSION= 2.22.2
PORTREVISION?= 0
CATEGORIES= x11 gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index f9ec25e3eebf..35da0525c46c 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-desktop-2.22.1.tar.bz2) = 39d1421dbfe54d0838a00b055edcb5cf
-SHA256 (gnome2/gnome-desktop-2.22.1.tar.bz2) = f1d9a2244a1f6521ec584d3d79c9a757373717e0f93c6617a97bbc98e4034f31
-SIZE (gnome2/gnome-desktop-2.22.1.tar.bz2) = 1443150
+MD5 (gnome2/gnome-desktop-2.22.2.tar.bz2) = 6d6271cfa135ce016126414d929b8fb7
+SHA256 (gnome2/gnome-desktop-2.22.2.tar.bz2) = 4bd3141b2c668b24b43ac10a7a7040ce0717d8f088aee8a93ef261e446d88818
+SIZE (gnome2/gnome-desktop-2.22.2.tar.bz2) = 1443309
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index fa73b6407ae1..38d6a412e780 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -84,8 +84,8 @@ share/locale/et/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/eu/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/fa/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/fi/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/fur/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/fur/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/gu/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -297,10 +297,10 @@ share/pixmaps/vnterm.xpm
@dirrm share/gnome/help/fdl/es
@dirrm share/gnome/help/fdl/ar
@dirrm share/gnome-about/headers
+@dirrmtry share/applications
@dirrm include/gnome-desktop-2.0/libgnomeui
@dirrm include/gnome-desktop-2.0/libgnome
@dirrm include/gnome-desktop-2.0
-@dirrmtry share/applications
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES