From owner-svn-ports-all@freebsd.org Wed Nov 23 15:47:54 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E478C514BB; Wed, 23 Nov 2016 15:47:54 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2390A11F; Wed, 23 Nov 2016 15:47:54 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uANFlrrO010216; Wed, 23 Nov 2016 15:47:53 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uANFlrjQ010214; Wed, 23 Nov 2016 15:47:53 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201611231547.uANFlrjQ010214@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Wed, 23 Nov 2016 15:47:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426940 - in head/net: remmina 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Nov 2016 15:47:54 -0000 Author: woodsb02 Date: Wed Nov 23 15:47:53 2016 New Revision: 426940 URL: https://svnweb.freebsd.org/changeset/ports/426940 Log: net/remmina: Add USES=gettext localbase:ldflags - bin/remmina links to lib/libintl.so.8 regardless of NLS option Note: that NLS option still prevents translations from being installed - cmake needs to search for gettext within localbase net/remmina-plugin-*: Add USES=localbase:ldflags - The plugins need to search localbase/include for headers, and some also link with libraries in localbase Reported by: marino Approved by: adamw (mentor, implicit) Modified: head/net/remmina-plugins/bsd.plugin.mk head/net/remmina/Makefile Modified: head/net/remmina-plugins/bsd.plugin.mk ============================================================================== --- head/net/remmina-plugins/bsd.plugin.mk Wed Nov 23 15:33:32 2016 (r426939) +++ head/net/remmina-plugins/bsd.plugin.mk Wed Nov 23 15:47:53 2016 (r426940) @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS+= remmina>=${PORTVERSION}:net/remmina RUN_DEPENDS+= remmina>=${PORTVERSION}:net/remmina -USES+= cmake gmake pkgconfig +USES+= cmake gmake localbase:ldflags pkgconfig USE_GNOME+= atk gdkpixbuf2 glib20 gtk30 pango INSTALLS_ICONS= yes Modified: head/net/remmina/Makefile ============================================================================== --- head/net/remmina/Makefile Wed Nov 23 15:33:32 2016 (r426939) +++ head/net/remmina/Makefile Wed Nov 23 15:47:53 2016 (r426940) @@ -16,7 +16,7 @@ USE_GITHUB= yes GH_ACCOUNT= FreeRDP GH_PROJECT= Remmina -USES= cmake:outsource gmake pathfix pkgconfig +USES= cmake:outsource gettext gmake localbase:ldflags pathfix pkgconfig USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 pango USE_XORG= ice sm x11 xext PATHFIX_WRKSRC= ${WRKSRC}/remmina @@ -41,8 +41,7 @@ AVAHI_CMAKE_BOOL= WITH_AVAHI GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt GCRYPT_CMAKE_BOOL= WITH_GCRYPT -NLS_USES= gettext localbase -NLS_CMAKE_BOOL= WITH_GETTEXT +NLS_CMAKE_BOOL= WITH_TRANSLATIONS SSH_LIB_DEPENDS= libssh_threads.so:security/libssh SSH_LDFLAGS= -fstack-protector @@ -66,7 +65,5 @@ post-patch: ${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins)||' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins-gnome)||' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e's|add_subdirectory(external_tools)||' ${WRKSRC}/remmina/CMakeLists.txt -post-patch-NLS-off: - ${REINPLACE_CMD} -e's|add_subdirectory(po)||' ${WRKSRC}/remmina/CMakeLists.txt .include