4 files changed, 12 insertions, 14 deletions

diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 37be80fdd31b..88f30276bde9 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gnome-user-share
-PORTVERSION=	0.22
+PORTVERSION=	0.30
 CATEGORIES=	www deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -26,7 +26,7 @@ USE_APACHE=	2.0+
 USE_GNOME=	gnomeprefix gnomehack intlhack libglade2 gconf2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ARGS=	--disable-howl
+CONFIGURE_ARGS=	--disable-howl --with-modules-path=${LOCALBASE}/${APACHEMODDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -34,6 +34,6 @@ GCONF_SCHEMAS=	desktop_gnome_file_sharing.schemas
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/httpd/modules|${LOCALBASE}/${APACHEMODDIR}|g' \
-		${WRKSRC}/dav_user_${APACHE_VERSION:C/([0-9])$/.\1/}.conf
+		${WRKSRC}/data/dav_user_*.conf
 
 .include <bsd.port.mk>
diff --git a/www/gnome-user-share/distinfo b/www/gnome-user-share/distinfo
index a82e337bcfe4..548703cb0215 100644
--- a/www/gnome-user-share/distinfo
+++ b/www/gnome-user-share/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-share-0.22.tar.bz2) = 88722b281a49050d2333eb5c001459e6
-SHA256 (gnome2/gnome-user-share-0.22.tar.bz2) = 71641c7b0dfb13a59288b9e0a9975cf294e810e859c74d5cc121d1f5eaffbe46
-SIZE (gnome2/gnome-user-share-0.22.tar.bz2) = 337564
+MD5 (gnome2/gnome-user-share-0.30.tar.bz2) = 005f8773b5f1341ba9af153d3191c942
+SHA256 (gnome2/gnome-user-share-0.30.tar.bz2) = d1bfbc36063017b9aab74ffd6ae5473b81759c16f8cd95934b89a980c6a97678
+SIZE (gnome2/gnome-user-share-0.30.tar.bz2) = 343126
diff --git a/www/gnome-user-share/pkg-message b/www/gnome-user-share/pkg-message
index 66593e1d00ea..24af5f522fcb 100644
--- a/www/gnome-user-share/pkg-message
+++ b/www/gnome-user-share/pkg-message
@@ -1,14 +1,9 @@
 In order to take full advantage of gnome-user-share, you must have
-devel/gnomevfs2 built with Howl support.  If you do not, simply rebuild
+devel/gnomevfs2 built with mDNS support.  If you do not, simply rebuild
 devel/gnomevfs2 after gnome-user-share is installed:
 
 # portupgrade -f devel/gnomevfs2
 
-Next, start mDNSResponder as root.  You might consider adding an rc.d script
-for this:
-
-# mDNSResponder
-
 Finally, 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
diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist
index d4e97fa77a0b..49552523dc4b 100644
--- a/www/gnome-user-share/pkg-plist
+++ b/www/gnome-user-share/pkg-plist
@@ -1,12 +1,12 @@
 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.glade
-share/gnome/autostart/gnome-user-share.desktop
+share/gnome-user-share/file-share-properties.ui
 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
@@ -21,6 +21,7 @@ share/locale/dz/LC_MESSAGES/gnome-user-share.mo
 share/locale/el/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
 share/locale/es/LC_MESSAGES/gnome-user-share.mo
 share/locale/fi/LC_MESSAGES/gnome-user-share.mo
 share/locale/fr/LC_MESSAGES/gnome-user-share.mo
@@ -59,3 +60,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-user-share.mo
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry etc/xdg/autostart
+@dirrmtry etc/xdg