2 files changed, 14 insertions, 30 deletions

diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 1ebf918ef253..66ef513ea584 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	vinagre
 PORTVERSION=	2.30.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,16 +12,16 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VNC client for the GNOME Desktop
 
-LIB_DEPENDS=	gtk-vnc-1.0:${PORTSDIR}/net/gtk-vnc \
-    		avahi-core:${PORTSDIR}/net/avahi-app \
-		avahi-ui:${PORTSDIR}/net/avahi-gtk \
-		gdbm:${PORTSDIR}/databases/gdbm \
-		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS=	libgtk-vnc-1.0.so:${PORTSDIR}/net/gtk-vnc \
+		libavahi-core.so:${PORTSDIR}/net/avahi-app \
+		libavahi-ui.so:${PORTSDIR}/net/avahi-gtk \
+		libgdbm.so:${PORTSDIR}/databases/gdbm \
+		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 
 CONFLICTS=	vinagre-3.[0-9]*
 
-USE_BZIP2=	yes
-USES=		pathfix gettext gmake pkgconfig
+USES=		desktop-file-utils pathfix gettext gmake pkgconfig \
+		shared-mime-info tar:bzip2
 USE_GNOME=	gnomeprefix intlhack vte gconf2 gnomedocutils gnomepanel
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
@@ -32,31 +32,20 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	vinagre.schemas
 
-MAN1=		vinagre.1
-
 OPTIONS_DEFINE=	TELEPATHY
 OPTIONS_DEFAULT=TELEPATHY
+OPTIONS_SUB=	yes
 TELEPATHY_DESC=	Telepathy integration
+TELEPATHY_LIB_DEPENDS=	libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
+TELEPATHY_CONFIGURE_ENABLE=	telepathy
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MTELEPATHY}
-CONFIGURE_ARGS+=--enable-telepathy
-LIB_DEPENDS+=	telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
-PLIST_SUB+=	TELEPATHY=""
-.else
-CONFIGURE_ARGS+=--disable-telepathy
-PLIST_SUB+=	TELEPATHY="@comment "
-.endif
-
 post-install:
-	@-update-desktop-database > /dev/null
-	@-update-mime-database ${PREFIX}/share/mime > /dev/null
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in AUTHORS COPYING ChangeLog MAINTAINERS NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index 3c7f0e83b6d4..aceba0502cb7 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -34,6 +34,7 @@ lib/vinagre-1/plugins/libvnc.so
 lib/vinagre-1/plugins/ssh.vinagre-plugin
 lib/vinagre-1/plugins/vnc.vinagre-plugin
 libdata/pkgconfig/vinagre-1.0.pc
+man/man1/vinagre.1.gz
 share/applications/vinagre-file.desktop
 share/applications/vinagre.desktop
 %%TELEPATHY%%share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service
@@ -252,8 +253,6 @@ share/locale/uk/LC_MESSAGES/vinagre.mo
 share/locale/zh_CN/LC_MESSAGES/vinagre.mo
 share/locale/zh_HK/LC_MESSAGES/vinagre.mo
 share/locale/zh_TW/LC_MESSAGES/vinagre.mo
-share/mime/application/x-remote-connection.xml
-share/mime/application/x-vnc.xml
 share/mime/packages/vinagre-mime.xml
 share/omf/vinagre/vinagre-C.omf
 share/omf/vinagre/vinagre-ca.omf
@@ -326,10 +325,6 @@ share/vinagre-1/plugins/vnc/vnc.ui
 @dirrm lib/vinagre-1
 @dirrm include/vinagre-1.0/vinagre
 @dirrm include/vinagre-1.0
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES