4 files changed, 31 insertions, 32 deletions

diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 30a51da2e16d..a7ffc8dd9a74 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gnome-user-share/Makefile,v 1.17 2009/10/27 11:20:53 kwm Exp $
+#   $MCom: ports/www/gnome-user-share/Makefile,v 1.21 2010/04/01 21:10:51 kwm Exp $
 #
 
 PORTNAME=	gnome-user-share
-PORTVERSION=	2.28.2
-PORTREVISION=	5
+PORTVERSION=	2.30.0
 CATEGORIES=	www deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -21,14 +20,14 @@ LIB_DEPENDS=	avahi-client:${PORTSDIR}/net/avahi-app \
 		notify.1:${PORTSDIR}/devel/libnotify \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_dnssd.so:${PORTSDIR}/www/mod_dnssd \
-    		console-kit-daemon:${PORTSDIR}/sysutils/consolekit
+		console-kit-daemon:${PORTSDIR}/sysutils/consolekit
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_APACHE=	2.2+
 USE_XORG=	sm
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils
+USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils nautilus2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--with-modules-path=${LOCALBASE}/${APACHEMODDIR}
diff --git a/www/gnome-user-share/distinfo b/www/gnome-user-share/distinfo
index 0d401c89b986..c0d7485256ba 100644
--- a/www/gnome-user-share/distinfo
+++ b/www/gnome-user-share/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-share-2.28.2.tar.bz2) = 4a82f83ddf90c57dcfd1c79cba2bbd3f
-SHA256 (gnome2/gnome-user-share-2.28.2.tar.bz2) = b3250a8fcccf9f750cfa83f06d9d89abf193df1b689e27bbc802299d6875cfd2
-SIZE (gnome2/gnome-user-share-2.28.2.tar.bz2) = 915004
+MD5 (gnome2/gnome-user-share-2.30.0.tar.bz2) = a736a1bebc1782d3d6e7a7239158f189
+SHA256 (gnome2/gnome-user-share-2.30.0.tar.bz2) = 75f5424d7062c8ee82c2a65f6c952a04aca92070134de4a69c9e2e5ec50d4163
+SIZE (gnome2/gnome-user-share-2.30.0.tar.bz2) = 944583
diff --git a/www/gnome-user-share/files/patch-configure b/www/gnome-user-share/files/patch-configure
index 52ca647a5e2f..27fe70c56841 100644
--- a/www/gnome-user-share/files/patch-configure
+++ b/www/gnome-user-share/files/patch-configure
@@ -1,38 +1,38 @@
---- configure.orig	2009-10-27 12:12:48.000000000 +0100
-+++ configure	2009-10-27 12:15:00.000000000 +0100
-@@ -15214,12 +15214,12 @@
+--- configure.orig	2010-03-16 13:46:47.000000000 +0100
++++ configure	2010-03-16 13:46:47.000000000 +0100
+@@ -13261,12 +13261,12 @@
      pkg_cv_USER_SHARE_CFLAGS="$USER_SHARE_CFLAGS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\"") >&5
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\""; } >&5
 -  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES \"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES\""; } >&5
 +  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
 -  pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null`
 +  pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>/dev/null`
  else
    pkg_failed=yes
  fi
-@@ -15230,12 +15230,12 @@
+@@ -13277,12 +13277,12 @@
      pkg_cv_USER_SHARE_LIBS="$USER_SHARE_LIBS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\"") >&5
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\""; } >&5
 -  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES \"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES\""; } >&5
 +  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
 -  pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null`
 +  pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>/dev/null`
  else
    pkg_failed=yes
  fi
-@@ -15253,14 +15253,14 @@
+@@ -13300,14 +13300,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -45,17 +45,8 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$USER_SHARE_PKG_ERRORS" >&5
  
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met:
- 
- $USER_SHARE_PKG_ERRORS
- 
-@@ -15271,7 +15271,7 @@
- and USER_SHARE_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met:
-+$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met:
+-	as_fn_error "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met:
++	as_fn_error "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met:
  
  $USER_SHARE_PKG_ERRORS
  
diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist
index 9d64b7329e80..6423483af4d5 100644
--- a/www/gnome-user-share/pkg-plist
+++ b/www/gnome-user-share/pkg-plist
@@ -1,5 +1,7 @@
 bin/gnome-file-share-properties
 etc/xdg/autostart/gnome-user-share.desktop
+lib/nautilus/extensions-2.0/libnautilus-share-extension.la
+lib/nautilus/extensions-2.0/libnautilus-share-extension.so
 libexec/gnome-user-share
 share/applications/gnome-user-share-properties.desktop
 %%DATADIR%%/dav_groupfile
@@ -78,6 +80,7 @@ share/icons/hicolor/32x32/apps/gnome-obex-server.png
 share/icons/hicolor/48x48/apps/gnome-obex-server.png
 share/locale/ar/LC_MESSAGES/gnome-user-share.mo
 share/locale/as/LC_MESSAGES/gnome-user-share.mo
+share/locale/ast/LC_MESSAGES/gnome-user-share.mo
 share/locale/bg/LC_MESSAGES/gnome-user-share.mo
 share/locale/bn/LC_MESSAGES/gnome-user-share.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-user-share.mo
@@ -88,6 +91,7 @@ share/locale/da/LC_MESSAGES/gnome-user-share.mo
 share/locale/de/LC_MESSAGES/gnome-user-share.mo
 share/locale/dz/LC_MESSAGES/gnome-user-share.mo
 share/locale/el/LC_MESSAGES/gnome-user-share.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-user-share.mo
 share/locale/en_CA/LC_MESSAGES/gnome-user-share.mo
 share/locale/en_GB/LC_MESSAGES/gnome-user-share.mo
 share/locale/eu/LC_MESSAGES/gnome-user-share.mo
@@ -106,6 +110,7 @@ share/locale/ja/LC_MESSAGES/gnome-user-share.mo
 share/locale/kn/LC_MESSAGES/gnome-user-share.mo
 share/locale/ko/LC_MESSAGES/gnome-user-share.mo
 share/locale/lt/LC_MESSAGES/gnome-user-share.mo
+share/locale/lv/LC_MESSAGES/gnome-user-share.mo
 share/locale/mai/LC_MESSAGES/gnome-user-share.mo
 share/locale/mk/LC_MESSAGES/gnome-user-share.mo
 share/locale/ml/LC_MESSAGES/gnome-user-share.mo
@@ -188,11 +193,15 @@ share/omf/gnome-user-share/gnome-user-share-zh_CN.omf
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @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/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as