Move gnome3 ports into the place of the gnome2 locations.

Update to new port rules, remove conflicts, latest_link, enable stage support.

gnome-games was skipped because I got a update for that.
gnome-keyring 2 vs 3, needs to be looked at.
zenity 2 vs 3, and libgnomekbd 2 vs 3

Use new lib_depend syntax in bsd.gnome.mk.

Possible lots of broken links.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18813 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 35 insertions, 27 deletions

diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index b687ad669..9982884d4 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -1,60 +1,68 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/net/vinagre/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#  $MCom: ports/trunk/net/vinagre3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	vinagre
-PORTVERSION=	2.30.3
-PORTREVISION=	3
+PORTVERSION=	3.6.2
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VNC client for the GNOME Desktop
 
-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 \
+BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+LIB_DEPENDS=	libgtk-vnc-2.0.so:${PORTSDIR}/net/gtk-vnc3 \
+    		libavahi-core.so:${PORTSDIR}/net/avahi-app \
+		libavahi-ui-gtk3.so:${PORTSDIR}/net/avahi-gtk3 \
 		libgdbm.so:${PORTSDIR}/databases/gdbm \
+		libsecret-1.so:${PORTSDIR}/security/libsecret \
 		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
-CONFLICTS=	vinagre-3.[0-9]*
-
-NO_STAGE=	yes
-USE_BZIP2=	yes
-USES=		desktop-file-utils gettext gmake pathfix shared-mime-info
-USE_GNOME=	gnomeprefix intlhack vte gconf2 gnomedocutils gnomepanel
+USE_XZ=		yes
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
+		shared-mime-info
+USE_GNOME=	gnomeprefix gtk30 intlhack libxml2 vte3
 GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ARGS=	--enable-avahi --enable-applet -enable-ssh
-CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS=	--disable-spice --enable-ssh
+CPPFLAGS+=	-I${LOCALBASE}/include -Wno-format-nonliteral
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-GCONF_SCHEMAS=	vinagre.schemas
-
-MAN1=		vinagre.1
+GLIB_SCHEMAS=	org.gnome.Vinagre.gschema.xml
 
-OPTIONS_DEFINE=	TELEPATHY
-OPTIONS_DEFAULT=TELEPATHY
+OPTIONS_DEFINE=	TELEPATHY RDP
+OPTIONS_DEFAULT=TELEPATHY RDP
 TELEPATHY_DESC=	Telepathy integration
+RDP_DESC=	MS Windows remote desktop support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTELEPATHY}
-CONFIGURE_ARGS+=--enable-telepathy
-LIB_DEPENDS+=	libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
+LIB_DEPENDS+=	libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 PLIST_SUB+=	TELEPATHY=""
 .else
-CONFIGURE_ARGS+=--disable-telepathy
+CONFIGURE_ARGS+=--without-telepathy
 PLIST_SUB+=	TELEPATHY="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MRDP}
+BUILD_DEPENDS+=	rdesktop:${PORTSDIR}/net/rdesktop
+RUN_DEPENDS+=	rdesktop:${PORTSDIR}/net/rdesktop
+CONFIGURE_ARGS+=--enable-rdp
+PLIST_SUB+=	RDP=""
+.else
+CONFIGURE_ARGS+=--disable-rdp
+PLIST_SUB+=	RDP="@comment "
+.endif
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for f in AUTHORS COPYING ChangeLog MAINTAINERS NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in AUTHORS COPYING ChangeLog NEWS README
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif