21 files changed, 100 insertions, 165 deletions
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 56bf8c65b..04609ef02 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	avahi
-# Date created:		18 November 2005
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net/avahi-app/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	avahi
 PORTVERSION=	0.6.31
@@ -20,17 +16,17 @@ AVAHI_SLAVE?=	no
 
 .if ${AVAHI_SLAVE}!="header"
 BUILD_DEPENDS?=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS?=	expat.6:${PORTSDIR}/textproc/expat2 \
-		daemon.0:${PORTSDIR}/devel/libdaemon \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS?=	expat:${PORTSDIR}/textproc/expat2 \
+		daemon:${PORTSDIR}/devel/libdaemon \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		gdbm:${PORTSDIR}/databases/gdbm
 RUN_DEPENDS?=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
 USERS?=		${PORTNAME}
 GROUPS?=	${USERS}
 
-USE_GNOME?=	gnomehack ltverhack glib20 intltool
-USE_GETTEXT=	yes
+USE_GNOME?=	ltverhack glib20 intltool
+USES=		gettext pathfix pkgconfig
 USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
index f33f40944..f42860495 100644
--- a/net/avahi-gtk/Makefile
+++ b/net/avahi-gtk/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	avahi-gtk
-# Date created:				31 July 2007
-# Whom:					Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net/avahi-gtk/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTREVISION=	0
 CATEGORIES=	net
diff --git a/net/avahi-gtk3/Makefile b/net/avahi-gtk3/Makefile
index 574963f46..d52d662e0 100644
--- a/net/avahi-gtk3/Makefile
+++ b/net/avahi-gtk3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	avahi-gtk
-# Date created:				31 July 2007
-# Whom:					Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net/avahi-gtk3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTREVISION=	0
 CATEGORIES=	net
diff --git a/net/avahi-header/Makefile b/net/avahi-header/Makefile
index 8e1145457..4aa747fe2 100644
--- a/net/avahi-header/Makefile
+++ b/net/avahi-header/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	avahi-gtk
-# Date created:				31 July 2007
-# Whom:					Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net/avahi-header/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTREVISION=	0
 CATEGORIES=	net
diff --git a/net/avahi-qt3/Makefile b/net/avahi-qt3/Makefile
index a972c29de..438abdb06 100644
--- a/net/avahi-qt3/Makefile
+++ b/net/avahi-qt3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	avahi-qt3
-# Date created:				12 April 2007
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net/avahi-qt3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTREVISION=	0
 CATEGORIES=	net
@@ -13,7 +9,7 @@ PKGNAMESUFFIX=	-qt3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Qt 3 bindings to the Avahi mDNS system
 
-LIB_DEPENDS=	avahi-common.3:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS=	avahi-common:${PORTSDIR}/net/avahi-app
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-qt
@@ -22,7 +18,8 @@ DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 AVAHI_SLAVE=	qt3
-USE_GNOME=	gnomehack ltverhack intltool
+USES=		pathfix
+USE_GNOME=	ltverhack intltool
 USE_QT_VER=	3
 AVAHI_PKGCONFIG=	avahi-qt3.pc
 
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index ffc40c0e3..b34f61a46 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	avahi
-# Date created:		18 November 2005
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net/avahi/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	avahi
 PORTVERSION=	0.6.31
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index c452f9d98..e303412a7 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -1,9 +1,6 @@
-# Ports collection Makefile for:	gnomemeeting
-# Date created:				24/07/2001
-# Whom:					roger@FreeBSD.org
-#
+# Created by: roger@FreeBSD.org
 # $FreeBSD$
-#
+#  $MCom$
 
 PORTNAME=	ekiga
 PORTVERSION=	2.0.11
@@ -23,10 +20,10 @@ CONFLICTS=	ekiga3-3.*
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix
 USE_SDL=	sdl
 INSTALLS_OMF=	yes
-USE_GNOME=	libgnomeui gnomeprefix gnomehack gnomedocutils \
+USE_GNOME=	libgnomeui gnomeprefix gnomedocutils \
 		evolutiondataserver intlhack
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile
index 3c7d60487..e44d471a7 100644
--- a/net/ekiga3/Makefile
+++ b/net/ekiga3/Makefile
@@ -22,10 +22,10 @@ CONFLICTS=	ekiga-2.*
 USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
 USE_XORG=	xv
-USE_GNOME=	gtk20 gnomehack
+USE_GNOME=	gtk20
 DIST_SUBDIR=	gnome2
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 88b4af19a..728e1192e 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   gnomenetwork
-# Date Created:			03 June 2003
-# Whom:				Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net/gnome-nettool/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-nettool
 PORTVERSION=	2.32.0
@@ -17,14 +13,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME utility that provides network information statistics
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop
 
 CONFLICTS=	gnome-nettool-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
+USE_GNOME=	intlhack gnomeprefix libglade2 gconf2 gnomedocutils
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/gnome-nettool3/Makefile b/net/gnome-nettool3/Makefile
index 4c688e943..31835cfe9 100644
--- a/net/gnome-nettool3/Makefile
+++ b/net/gnome-nettool3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   gnomenetwork
-# Date Created:			03 June 2003
-# Whom:				Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net/gnome-nettool3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-nettool
 PORTVERSION=	3.2.0
@@ -16,15 +12,15 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME utility that provides network information statistics
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop
 
 CONFLICTS=	gnome-nettool-2.[0-9]*
 LATEST_LINK=	gnome-nettool3
 
 USE_XZ=		yes
-USE_GNOME=	gnomehack intlhack gnomeprefix gtk30 gnomedocutils
+USE_GNOME=	intlhack gnomeprefix gtk30 gnomedocutils
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/gnome-online-accounts/Makefile b/net/gnome-online-accounts/Makefile
index 1dbb328f7..3a14f402c 100644
--- a/net/gnome-online-accounts/Makefile
+++ b/net/gnome-online-accounts/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:   gnome-online-accounts
-# Date Created:			15 Sep 2011
-# Whom:				Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net/gnome-online-accounts/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-online-accounts
 PORTVERSION=	3.4.2
@@ -22,9 +19,9 @@ LIB_DEPENDS=	webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 \
 		rest-0.7:${PORTSDIR}/www/rest
 
 USE_XZ=		yes
-USE_GNOME=	gnomehack gtk30 intlhack
+USE_GNOME=	gtk30 intlhack
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 9a957d495..f2c008c04 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -17,9 +17,9 @@ LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 
 CONFLICTS=	gtk-vnc-0.4.[0-9]*
 
-USE_GNOME=	pygtk2 gnomehack
+USE_GNOME=	pygtk2
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index d2797302f..eb1c31946 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libgweather
-# Date created:				14th Jan 2008
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net/libgweather/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	libgweather
 PORTVERSION=	2.30.3
@@ -16,15 +12,15 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library to accessing online weather informations
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 CONFLICTS=	libgweather-3.[0-9]*
 
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 ltverhack
+USE_GNOME=	gnomeprefix intlhack gconf2 ltverhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/libgweather3/Makefile b/net/libgweather3/Makefile
index 743210e83..619207675 100644
--- a/net/libgweather3/Makefile
+++ b/net/libgweather3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libgweather
-# Date created:				14th Jan 2008
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net/libgweather3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	libgweather
 PORTVERSION=	3.4.1
@@ -15,18 +11,18 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library to accessing online weather informations
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 CONFLICTS=	libgweather-2.[0-9]*
 
 LATEST_LINK=	libgweather3
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_XZ=		yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 ltverhack gtk30
+USE_GNOME=	gnomeprefix intlhack gconf2 ltverhack gtk30
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile
index 95ef305a5..41ad88517 100644
--- a/net/libproxy/Makefile
+++ b/net/libproxy/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	libproxy
-# Date created:		26 February 2009
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net/libproxy/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	libproxy
 PORTVERSION=	0.4.6
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index c4af2ed20..559a2aa26 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	vinagre
-# Date created:				16 December 2007
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net/vinagre/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	vinagre
 PORTVERSION=	2.30.3
@@ -16,18 +12,17 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VNC client for the GNOME Desktop
 
-LIB_DEPENDS=	gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \
-    		avahi-core.7:${PORTSDIR}/net/avahi-app \
-		avahi-ui.0:${PORTSDIR}/net/avahi-gtk \
-		gdbm.4:${PORTSDIR}/databases/gdbm \
+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
 
 CONFLICTS=	vinagre-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack vte gconf2 gnomedocutils \
-		gnomepanel
+USES=		gettext pathfix desktop-file-utils shared-mime-info
+USE_GNOME=	gnomeprefix intlhack vte gconf2 gnomedocutils gnomepanel
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
@@ -54,8 +49,6 @@ PLIST_SUB+=	TELEPATHY="@comment "
 .endif
 
 post-install:
-	@-update-desktop-database > /dev/null
-	@-update-mime-database ${PREFIX}/share/mime > /dev/null
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in AUTHORS COPYING ChangeLog MAINTAINERS NEWS README
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index e104951d7..a8b4705f3 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -327,10 +327,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
diff --git a/net/vinagre3/Makefile b/net/vinagre3/Makefile
index d6043fd1f..406b9aab8 100644
--- a/net/vinagre3/Makefile
+++ b/net/vinagre3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	vinagre
-# Date created:				16 December 2007
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#  $MCom$
-#
+#  $MCom: ports/trunk/net/vinagre3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	vinagre
 PORTVERSION=	3.4.2
@@ -27,8 +23,8 @@ CONFLICTS=	vinagre-2.[0-9]*
 
 LATEST_LINK=	vinagre3
 USE_XZ=		yes
-USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gtk30 libxml2 vte3
+USES=		gettext pathfix pkgconfig desktop-file-utils shared-mime-info
+USE_GNOME=	gnomeprefix intlhack gtk30 libxml2 vte3
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
@@ -41,21 +37,23 @@ GLIB_SCHEMAS=	org.gnome.Vinagre.gschema.xml
 
 MAN1=		vinagre.1
 
-OPTIONS=	TELEPATHY "Enable telepathy integration" on \
-		RDP "Enable MS Windows remote desktop support" off
+OPTIONS_DEFINE=	TELEPATHY RDP
+OPTIONS_DEFAULT=TELEPATHY
+TELEPATHY=	Telepathy integration
+RDP_DESC=	MS Windows remote desktop support
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_TELEPATHY)
-LIB_DEPENDS+=	telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+.if ${PORT_OPTIONS:MTELEPATHY}
+LIB_DEPENDS+=	telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 PLIST_SUB+=	TELEPATHY=""
 .else
 CONFIGURE_ARGS+=--without-telepathy
 PLIST_SUB+=	TELEPATHY="@comment "
 .endif
 
-.if !defined(WITHOUT_RDP)
+.if ${PORT_OPTIONS:MRDP}
 BUILD_DEPENDS+=	rdesktop:${PORTSDIR}/net/rdesktop
 RUN_DEPENDS+=	rdesktop:${PORTSDIR}/net/rdesktop
 CONFIGURE_ARGS+=--enable-rdp
@@ -66,9 +64,7 @@ PLIST_SUB+=	RDP="@comment "
 .endif
 
 post-install:
-	@-update-desktop-database > /dev/null
-	@-update-mime-database ${PREFIX}/share/mime > /dev/null
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in AUTHORS COPYING ChangeLog NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
diff --git a/net/vinagre3/pkg-plist b/net/vinagre3/pkg-plist
index 5cd5b80dc..27ace6cae 100644
--- a/net/vinagre3/pkg-plist
+++ b/net/vinagre3/pkg-plist
@@ -347,7 +347,3 @@ share/mime/packages/vinagre-mime.xml
 @dirrmtry share/help
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
-@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
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 0e36309b4..65b6763d9 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	vino
-# Date created:				16 July 2004
-# Whom:					Tom McLaughlin <tmclaugh@sdf.lonestar.org>
-#
+# Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net/vino/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	vino
 PORTVERSION=	2.32.2
@@ -17,14 +13,14 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VNC server that allows for remote access to your GNOME desktop
 
 LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
-		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
-		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
+		unique-1.0:${PORTSDIR}/x11-toolkits/unique
 
 CONFLICTS=	vino-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gnomepanel
+USES=		gettext pathfix pkgconfig
+USE_GNOME=	gnomeprefix intlhack gnomepanel
 USE_XORG=	xtst
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -34,8 +30,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	vino-server.schemas
 
-.if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
+OPTIONS_DEFINE=	NOTIFY
+OPTIONS_DEFAULT=NOTIFY
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNOTIFY}
+LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--enable-libnotify=yes
 .else
 CONFIGURE_ARGS+=--enable-libnotify=no
diff --git a/net/vino3/Makefile b/net/vino3/Makefile
index 7e427c1f3..d116f7897 100644
--- a/net/vino3/Makefile
+++ b/net/vino3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	vino
-# Date created:				16 July 2004
-# Whom:					Tom McLaughlin <tmclaugh@sdf.lonestar.org>
-#
+# Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net/vino3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	vino
 PORTVERSION=	3.4.2
@@ -26,8 +22,8 @@ CONFLICTS=	vino-2.[0-9]*
 
 LATEST_LINK=	vino3
 USE_XZ=		yes
-USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gtk30
+USES=		gettext pathfix
+USE_GNOME=	gnomeprefix intlhack gtk30
 USE_XORG=	xdamage xfixes xtst
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -38,8 +34,13 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.gnome.Vino.enums.xml org.gnome.Vino.gschema.xml
 
-.if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
+OPTIONS_DEFINE=	NOTIFY
+OPTIONS_DEFAULT=NOTIFY
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNOTIFY}
+LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
 .else
 CONFIGURE_ARGS+=--without-libnotify
 .endif