summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorgusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059>2014-05-13 14:29:21 +0800
committergusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059>2014-05-13 14:29:21 +0800
commitdab26fffd4961e52a7687fc85555249cca62248f (patch)
tree1a79bc325f47cecd29957913fa70bc2fbf70da84 /net
parentfa206491013bad744fa4b9f5278eda9222c60028 (diff)
downloadmarcuscom-ports-dab26fffd4961e52a7687fc85555249cca62248f.tar
marcuscom-ports-dab26fffd4961e52a7687fc85555249cca62248f.tar.gz
marcuscom-ports-dab26fffd4961e52a7687fc85555249cca62248f.tar.bz2
marcuscom-ports-dab26fffd4961e52a7687fc85555249cca62248f.tar.lz
marcuscom-ports-dab26fffd4961e52a7687fc85555249cca62248f.tar.xz
marcuscom-ports-dab26fffd4961e52a7687fc85555249cca62248f.tar.zst
marcuscom-ports-dab26fffd4961e52a7687fc85555249cca62248f.zip
Update vinagre to 3.12.2. While here convert the TELEPATHY and RDP
options to the compact version. Had to keep DOCS in the verbose version though. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19642 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'net')
-rw-r--r--net/vinagre/Makefile30
-rw-r--r--net/vinagre/distinfo4
2 files changed, 11 insertions, 23 deletions
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 040689a0b..92e8b9489 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -1,9 +1,9 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports-experimental/trunk/net/vinagre/Makefile 19501 2014-04-14 19:41:06Z gusi $
+# $MCom$
PORTNAME= vinagre
-PORTVERSION= 3.12.1
+PORTVERSION= 3.12.2
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -18,7 +18,7 @@ LIB_DEPENDS= libgtk-vnc-2.0.so:${PORTSDIR}/net/gtk-vnc \
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
+RUN_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
USES= desktop-file-utils gettext gmake pathfix pkgconfig \
shared-mime-info tar:xz
@@ -31,31 +31,19 @@ LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.Vinagre.gschema.xml
+OPTIONS_SUB= yes
OPTIONS_DEFINE= TELEPATHY RDP
OPTIONS_DEFAULT=TELEPATHY RDP
TELEPATHY_DESC= Telepathy integration
RDP_DESC= MS Windows remote desktop support
+TELEPATHY_CONFIGURE_WITH= telepathy
+TELEPATHY_LIB_DEPENDS= libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
+ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+RDP_CONFIGURE_ENABLE= rdp
+RDP_RUN_DEPENDS= xfreerdp:${PORTSDIR}/net/freerdp
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MTELEPATHY}
-LIB_DEPENDS+= libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
- libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-PLIST_SUB+= TELEPATHY=""
-.else
-CONFIGURE_ARGS+=--without-telepathy
-PLIST_SUB+= TELEPATHY="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRDP}
-RUN_DEPENDS+= xfreerdp:${PORTSDIR}/net/freerdp
-CONFIGURE_ARGS+=--enable-rdp
-PLIST_SUB+= RDP=""
-.else
-CONFIGURE_ARGS+=--disable-rdp
-PLIST_SUB+= RDP="@comment "
-.endif
-
post-install:
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index bbf85c23c..0a9a43f96 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/vinagre-3.12.1.tar.xz) = 11453b2e8c96c22a47556afd99f47274337e1d56b2cc74e33e50629e2cb7bdb5
-SIZE (gnome3/vinagre-3.12.1.tar.xz) = 1086496
+SHA256 (gnome3/vinagre-3.12.2.tar.xz) = d1959bfa7b82aad79b96ed92d11f37209a0f5cccdb025c91574a9a85381d82fc
+SIZE (gnome3/vinagre-3.12.2.tar.xz) = 1088128