4 files changed, 105 insertions, 25 deletions

diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 0d820afb4956..9e0bc6e9af8e 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gnome-user-share/Makefile,v 1.8 2008/02/24 20:36:08 marcus Exp $
+#   $MCom: ports/www/gnome-user-share/Makefile,v 1.14 2009/03/17 13:35:33 kwm Exp $
 #
 
 PORTNAME=	gnome-user-share
-PORTVERSION=	0.31
-PORTREVISION=	2
+PORTVERSION=	2.26.0
+PORTREVISION=	0
 CATEGORIES=	www deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,16 +16,18 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Personal file-sharing service for the GNOME Desktop
 
-LIB_DEPENDS=	avahi-client:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS=	avahi-client:${PORTSDIR}/net/avahi-app \
+		notify.1:${PORTSDIR}/devel/libnotify
+RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_dnssd.so:${PORTSDIR}/www/mod_dnssd
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_APACHE=	2.0+
-USE_GNOME=	gnomeprefix gnomehack intlhack libglade2 gconf2
+USE_APACHE=	2.2+
+USE_GNOME=	gnomeprefix gnomehack intlhack libglade2 gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ARGS=	--disable-howl --with-modules-path=${LOCALBASE}/${APACHEMODDIR}
+CONFIGURE_ARGS=	--with-modules-path=${LOCALBASE}/${APACHEMODDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/www/gnome-user-share/distinfo b/www/gnome-user-share/distinfo
index 02f8edd7970b..e02044498cab 100644
--- a/www/gnome-user-share/distinfo
+++ b/www/gnome-user-share/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-share-0.31.tar.bz2) = 81d2b3d6c0694e5669330d8ad5c8a4b0
-SHA256 (gnome2/gnome-user-share-0.31.tar.bz2) = 4a00702d6f653ad461445adedf8c26720dd8a24fcfffff55e9ede30010cbb622
-SIZE (gnome2/gnome-user-share-0.31.tar.bz2) = 345185
+MD5 (gnome2/gnome-user-share-2.26.0.tar.bz2) = c99133b74a81a78ac0e4e10ef73fada7
+SHA256 (gnome2/gnome-user-share-2.26.0.tar.bz2) = 405be1ffbec4f865846746ab016e6816a58d9e2f2545fae48c31d4999c94d5f6
+SIZE (gnome2/gnome-user-share-2.26.0.tar.bz2) = 644020
diff --git a/www/gnome-user-share/pkg-message b/www/gnome-user-share/pkg-message
index 4fe34b829c7b..84e4725071cf 100644
--- a/www/gnome-user-share/pkg-message
+++ b/www/gnome-user-share/pkg-message
@@ -1,10 +1,4 @@
-In order to take full advantage of gnome-user-share, you must have
-devel/gnome-vfs built with mDNS support.  If you do not, simply rebuild
-devel/gnome-vfs after gnome-user-share is installed:
-
-# portupgrade -f devel/gnome-vfs
-
-Finally, run gnome-file-share-properties as the user with which you want
+Run gnome-file-share-properties as the user with which you want
 to use gnome-user-share, then logout and log back into GNOME.  Now everything
 under ~/Public should be shared.  You can view this by opening Nautilus, and
 clicking on the Network icon under Computer.
diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist
index 49552523dc4b..447088a2ca0b 100644
--- a/www/gnome-user-share/pkg-plist
+++ b/www/gnome-user-share/pkg-plist
@@ -2,17 +2,60 @@ bin/gnome-file-share-properties
 etc/xdg/autostart/gnome-user-share.desktop
 libexec/gnome-user-share
 share/applications/gnome-user-share-properties.desktop
-share/gnome-user-share/dav_groupfile
-share/gnome-user-share/dav_user.conf
-share/gnome-user-share/dav_user_2.0.conf
-share/gnome-user-share/dav_user_2.2.conf
-share/gnome-user-share/file-share-properties.ui
+%%DATADIR%%/dav_groupfile
+%%DATADIR%%/dav_user_2.0.conf
+%%DATADIR%%/dav_user_2.2.conf
+%%DATADIR%%/file-share-properties.ui
+share/gnome/help/gnome-user-share/C/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/C/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/C/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/C/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/C/gnome-user-share.xml
+share/gnome/help/gnome-user-share/C/legal.xml
+share/gnome/help/gnome-user-share/de/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/de/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/de/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/de/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/de/gnome-user-share.xml
+share/gnome/help/gnome-user-share/de/legal.xml
+share/gnome/help/gnome-user-share/el/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/el/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/el/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/el/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/el/gnome-user-share.xml
+share/gnome/help/gnome-user-share/el/legal.xml
+share/gnome/help/gnome-user-share/en_GB/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/en_GB/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/en_GB/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/en_GB/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/en_GB/gnome-user-share.xml
+share/gnome/help/gnome-user-share/en_GB/legal.xml
+share/gnome/help/gnome-user-share/es/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/es/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/es/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/es/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/es/gnome-user-share.xml
+share/gnome/help/gnome-user-share/es/legal.xml
+share/gnome/help/gnome-user-share/it/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/it/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/it/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/it/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/it/gnome-user-share.xml
+share/gnome/help/gnome-user-share/it/legal.xml
+share/gnome/help/gnome-user-share/sv/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/sv/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/sv/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/sv/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/sv/gnome-user-share.xml
+share/gnome/help/gnome-user-share/sv/legal.xml
 share/icons/hicolor/16x16/apps/gnome-obex-server.png
 share/icons/hicolor/22x22/apps/gnome-obex-server.png
 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/bg/LC_MESSAGES/gnome-user-share.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-user-share.mo
 share/locale/ca/LC_MESSAGES/gnome-user-share.mo
 share/locale/cs/LC_MESSAGES/gnome-user-share.mo
 share/locale/da/LC_MESSAGES/gnome-user-share.mo
@@ -27,38 +70,79 @@ share/locale/fi/LC_MESSAGES/gnome-user-share.mo
 share/locale/fr/LC_MESSAGES/gnome-user-share.mo
 share/locale/gl/LC_MESSAGES/gnome-user-share.mo
 share/locale/gu/LC_MESSAGES/gnome-user-share.mo
+share/locale/he/LC_MESSAGES/gnome-user-share.mo
+share/locale/hi/LC_MESSAGES/gnome-user-share.mo
 share/locale/hu/LC_MESSAGES/gnome-user-share.mo
 share/locale/it/LC_MESSAGES/gnome-user-share.mo
 share/locale/ja/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/mk/LC_MESSAGES/gnome-user-share.mo
+share/locale/ml/LC_MESSAGES/gnome-user-share.mo
+share/locale/mr/LC_MESSAGES/gnome-user-share.mo
 share/locale/nb/LC_MESSAGES/gnome-user-share.mo
 share/locale/ne/LC_MESSAGES/gnome-user-share.mo
 share/locale/nl/LC_MESSAGES/gnome-user-share.mo
 share/locale/oc/LC_MESSAGES/gnome-user-share.mo
+share/locale/or/LC_MESSAGES/gnome-user-share.mo
 share/locale/pa/LC_MESSAGES/gnome-user-share.mo
 share/locale/pl/LC_MESSAGES/gnome-user-share.mo
 share/locale/pt/LC_MESSAGES/gnome-user-share.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-user-share.mo
+share/locale/ro/LC_MESSAGES/gnome-user-share.mo
 share/locale/ru/LC_MESSAGES/gnome-user-share.mo
 share/locale/rw/LC_MESSAGES/gnome-user-share.mo
 share/locale/sk/LC_MESSAGES/gnome-user-share.mo
 share/locale/sl/LC_MESSAGES/gnome-user-share.mo
 share/locale/sq/LC_MESSAGES/gnome-user-share.mo
 share/locale/sv/LC_MESSAGES/gnome-user-share.mo
+share/locale/ta/LC_MESSAGES/gnome-user-share.mo
+share/locale/te/LC_MESSAGES/gnome-user-share.mo
+share/locale/th/LC_MESSAGES/gnome-user-share.mo
 share/locale/tr/LC_MESSAGES/gnome-user-share.mo
 share/locale/uk/LC_MESSAGES/gnome-user-share.mo
 share/locale/vi/LC_MESSAGES/gnome-user-share.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-user-share.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-user-share.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-user-share.mo
-@dirrm share/gnome-user-share
+share/omf/gnome-user-share/gnome-user-share-C.omf
+share/omf/gnome-user-share/gnome-user-share-de.omf
+share/omf/gnome-user-share/gnome-user-share-el.omf
+share/omf/gnome-user-share/gnome-user-share-en_GB.omf
+share/omf/gnome-user-share/gnome-user-share-es.omf
+share/omf/gnome-user-share/gnome-user-share-it.omf
+share/omf/gnome-user-share/gnome-user-share-sv.omf
+@dirrm share/omf/gnome-user-share
+@dirrm share/gnome/help/gnome-user-share/sv/figures
+@dirrm share/gnome/help/gnome-user-share/sv
+@dirrm share/gnome/help/gnome-user-share/it/figures
+@dirrm share/gnome/help/gnome-user-share/it
+@dirrm share/gnome/help/gnome-user-share/es/figures
+@dirrm share/gnome/help/gnome-user-share/es
+@dirrm share/gnome/help/gnome-user-share/en_GB/figures
+@dirrm share/gnome/help/gnome-user-share/en_GB
+@dirrm share/gnome/help/gnome-user-share/el/figures
+@dirrm share/gnome/help/gnome-user-share/el
+@dirrm share/gnome/help/gnome-user-share/de/figures
+@dirrm share/gnome/help/gnome-user-share/de
+@dirrm share/gnome/help/gnome-user-share/C/figures
+@dirrm share/gnome/help/gnome-user-share/C
+@dirrm share/gnome/help/gnome-user-share
+@dirrm %%DATADIR%%
 @dirrmtry share/applications
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as