From 6b7cedbc2fc408ae8ad605b6e31175a1c82ebbe6 Mon Sep 17 00:00:00 2001 From: Dima Panov Date: Mon, 20 Jan 2014 04:45:49 +0000 Subject: [PATCH] - Unbroke remmina-plugin-nx build by define dependency on libssh directly - Remove libssh block from common plugins block, it used only for -nx --- net/remmina-plugin-nx/Makefile | 2 ++ net/remmina-plugins/bsd.plugin.mk | 11 ----------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/net/remmina-plugin-nx/Makefile b/net/remmina-plugin-nx/Makefile index fea561401e9a..363245ebef53 100644 --- a/net/remmina-plugin-nx/Makefile +++ b/net/remmina-plugin-nx/Makefile @@ -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" diff --git a/net/remmina-plugins/bsd.plugin.mk b/net/remmina-plugins/bsd.plugin.mk index 3bf017372253..c88328931500 100644 --- a/net/remmina-plugins/bsd.plugin.mk +++ b/net/remmina-plugins/bsd.plugin.mk @@ -27,17 +27,6 @@ SSH_DESC= Build with SSH tunneling support .include -.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 .if ${PKGNAMESUFFIX} == "-i18n" || ${PKGNAMESUFFIX} == "-gnome"