From owner-svn-ports-head@FreeBSD.ORG  Mon Jan 20 04:45:50 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 81B8E207;
 Mon, 20 Jan 2014 04:45:50 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6D7491F59;
 Mon, 20 Jan 2014 04:45:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0K4jodL077807;
 Mon, 20 Jan 2014 04:45:50 GMT (envelope-from fluffy@svn.freebsd.org)
Received: (from fluffy@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0K4jonN077805;
 Mon, 20 Jan 2014 04:45:50 GMT (envelope-from fluffy@svn.freebsd.org)
Message-Id: <201401200445.s0K4jonN077805@svn.freebsd.org>
From: Dima Panov <fluffy@FreeBSD.org>
Date: Mon, 20 Jan 2014 04:45:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340367 - in head/net: remmina-plugin-nx remmina-plugins
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jan 2014 04:45:50 -0000

Author: fluffy
Date: Mon Jan 20 04:45:49 2014
New Revision: 340367
URL: http://svnweb.freebsd.org/changeset/ports/340367
QAT: https://qat.redports.org/buildarchive/r340367/

Log:
  - Unbroke remmina-plugin-nx build by define dependency on libssh directly
  - Remove libssh block from common plugins block, it used only for -nx

Modified:
  head/net/remmina-plugin-nx/Makefile
  head/net/remmina-plugins/bsd.plugin.mk

Modified: head/net/remmina-plugin-nx/Makefile
==============================================================================
--- head/net/remmina-plugin-nx/Makefile	Mon Jan 20 04:23:44 2014	(r340366)
+++ head/net/remmina-plugin-nx/Makefile	Mon Jan 20 04:45:49 2014	(r340367)
@@ -9,6 +9,8 @@ USE_XORG+=	xkbfile
 
 MASTERDIR=	${.CURDIR}/../remmina-plugins
 
+LIB_DEPENDS+=	libssh.so:${PORTSDIR}/security/libssh
+
 PLIST_SUB+=	ICONS="" SSH="@comment "
 
 .include "${MASTERDIR}/Makefile"

Modified: head/net/remmina-plugins/bsd.plugin.mk
==============================================================================
--- head/net/remmina-plugins/bsd.plugin.mk	Mon Jan 20 04:23:44 2014	(r340366)
+++ head/net/remmina-plugins/bsd.plugin.mk	Mon Jan 20 04:45:49 2014	(r340367)
@@ -27,17 +27,6 @@ SSH_DESC=	Build with SSH tunneling suppo
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSSH}
-LIB_DEPENDS+=	libssh.so:${PORTSDIR}/security/libssh
-PLIST_SUB+=	SSH=""
-.if ${OSVERSION} >= 800040
-LDFLAGS+=	-fstack-protector
-.endif
-.else
-CMAKE_ARGS+=	-DWITH_LIBSSH=OFF
-PLIST_SUB+=	SSH="@comment "
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${PKGNAMESUFFIX} == "-i18n" || ${PKGNAMESUFFIX} == "-gnome"