Date: Mon, 20 Jan 2014 04:45:50 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> 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 Message-ID: <201401200445.s0K4jonN077805@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401200445.s0K4jonN077805>