Attachment #177457 for bug #212004




# $FreeBSD$

PORTNAME=	vinagre
PORTVERSION=	3.22.0
PORTREVISION=	3
CATEGORIES=	net gnome
MASTER_SITES=	GNOME
DIST_SUBDIR=	gnome3

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	VNC client for the GNOME Desktop

BUILD_DEPENDS=	itstool:textproc/itstool \
		${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools
LIB_DEPENDS=	libgtk-vnc-2.0.so:net/gtk-vnc \
		libgdbm.so:databases/gdbm \
		libsecret-1.so:security/libsecret


PORTSCOUT=	limitw:1,even

USES=		autoreconf desktop-file-utils gettext gmake gnome pathfix \
		pkgconfig shared-mime-info tar:xz
USE_GNOME=	gtk30 intlhack libxml2 vte3
GNU_CONFIGURE=	yes
INSTALLS_ICONS=	yes

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (gnome3/vinagre-3.18.2.tar.xz) = 65b81299de0b75a9433e5654d5314f347895d5efb7acd3b111e5e8c03f48fbc4	1	TIMESTAMP = 1480270529
2	SIZE (gnome3/vinagre-3.18.2.tar.xz) = 819820	2	SHA256 (gnome3/vinagre-3.22.0.tar.xz) = cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82
		3	SIZE (gnome3/vinagre-3.22.0.tar.xz) = 1574984




From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 22 Apr 2016 14:54:09 -0700
Subject: [PATCH] handle new freerdp pkgconfig name

freerdp has now changed its pkgconfig name to 'freerdp2' -
https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming
we can build against both 1 and 2, we should handle both names.
--- configure.ac.orig	2016-09-20 06:02:32 UTC
+++ configure.ac
@@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [te
 
 # Whether to enable support for RDP.
 RDP_DEPS="freerdp x11"
+RDP_2_DEPS="freerdp2 x11"
 AC_ARG_ENABLE([rdp],
   [AS_HELP_STRING([--disable-rdp],
     [Disable Remote Desktop Protocol (RDP) support])])
@@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"],
     [have_rdp=yes
      PKG_CHECK_EXISTS(freerdp >= 1.1,
        [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])],
-    [have_rdp=no])],
+    [PKG_CHECK_EXISTS([$RDP_2_DEPS],
+       [have_rdp=yes
+        RDP_DEPS=$RDP_2_DEPS
+        AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])],
   [have_rdp=no])
 
 AS_IF([test "x$have_rdp" = "xyes"],

Return to bug 212004

Lines 2-9 Link Here

(-)Makefile (-5 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= vinagre	4	PORTNAME= vinagre
5	PORTVERSION= 3.18.2	5	PORTVERSION= 3.22.0
6	PORTREVISION= 3
7	CATEGORIES= net gnome	6	CATEGORIES= net gnome
8	MASTER_SITES= GNOME	7	MASTER_SITES= GNOME
9	DIST_SUBDIR= gnome3	8	DIST_SUBDIR= gnome3
Lines 11-17 Link Here
11	MAINTAINER= gnome@FreeBSD.org	10	MAINTAINER= gnome@FreeBSD.org
12	COMMENT= VNC client for the GNOME Desktop	11	COMMENT= VNC client for the GNOME Desktop
13		12
14	BUILD_DEPENDS= itstool:textproc/itstool	13	BUILD_DEPENDS= itstool:textproc/itstool \
		14	${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools
15	LIB_DEPENDS= libgtk-vnc-2.0.so:net/gtk-vnc \	15	LIB_DEPENDS= libgtk-vnc-2.0.so:net/gtk-vnc \
16	libgdbm.so:databases/gdbm \	16	libgdbm.so:databases/gdbm \
17	libsecret-1.so:security/libsecret	17	libsecret-1.so:security/libsecret
Lines 19-26 Link Here
19		19
20	PORTSCOUT= limitw:1,even	20	PORTSCOUT= limitw:1,even
21		21
22	USES= desktop-file-utils gettext gmake gnome pathfix pkgconfig \	22	USES= autoreconf desktop-file-utils gettext gmake gnome pathfix \
23	shared-mime-info tar:xz	23	pkgconfig shared-mime-info tar:xz
24	USE_GNOME= gtk30 intlhack libxml2 vte3	24	USE_GNOME= gtk30 intlhack libxml2 vte3
25	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
26	INSTALLS_ICONS= yes	26	INSTALLS_ICONS= yes

Line 0 Link Here

(-)files/patch-configure.ac (+30 lines)
	1	From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001
	2	From: Adam Williamson <awilliam@redhat.com>
	3	Date: Fri, 22 Apr 2016 14:54:09 -0700
	4	Subject: [PATCH] handle new freerdp pkgconfig name
	5
	6	freerdp has now changed its pkgconfig name to 'freerdp2' -
	7	https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming
	8	we can build against both 1 and 2, we should handle both names.
	9	--- configure.ac.orig 2016-09-20 06:02:32 UTC
	10	+++ configure.ac
	11	@@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [te
	12
	13	# Whether to enable support for RDP.
	14	RDP_DEPS="freerdp x11"
	15	+RDP_2_DEPS="freerdp2 x11"
	16	AC_ARG_ENABLE([rdp],
	17	[AS_HELP_STRING([--disable-rdp],
	18	[Disable Remote Desktop Protocol (RDP) support])])
	19	@@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"],
	20	[have_rdp=yes
	21	PKG_CHECK_EXISTS(freerdp >= 1.1,
	22	[AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])],
	23	- [have_rdp=no])],
	24	+ [PKG_CHECK_EXISTS([$RDP_2_DEPS],
	25	+ [have_rdp=yes
	26	+ RDP_DEPS=$RDP_2_DEPS
	27	+ AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])],
	28	[have_rdp=no])
	29
	30	AS_IF([test "x$have_rdp" = "xyes"],