Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Nov 2016 15:47:53 +0000 (UTC)
From:      Ben Woods <woodsb02@FreeBSD.org>
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
Message-ID:  <201611231547.uANFlrjQ010214@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611231547.uANFlrjQ010214>