Date: Thu, 20 Jun 2013 01:59:25 +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: r321344 - in head/net: . remmina remmina-plugin-gnome remmina-plugin-i18n remmina-plugin-nx remmina-plugin-rdp remmina-plugin-telepathy remmina-plugin-vnc remmina-plugin-xdmcp remmina-p... Message-ID: <201306200159.r5K1xP5g075748@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Thu Jun 20 01:59:25 2013 New Revision: 321344 URL: http://svnweb.freebsd.org/changeset/ports/321344 Log: - Update net/remmina and its plugins to 1.0.0 release - Add gnome and nx plugins Big thanks to Koichiro IWAIO for his work! Submitted by: Koichiro IWAIO <meta AT vmeta DOT jp> via mail Added: head/net/remmina-plugin-gnome/ head/net/remmina-plugin-gnome/Makefile (contents, props changed) head/net/remmina-plugin-gnome/pkg-plist (contents, props changed) head/net/remmina-plugin-nx/ head/net/remmina-plugin-nx/Makefile (contents, props changed) head/net/remmina/files/patch-remmina_CMakeFiles.txt (contents, props changed) head/net/remmina/files/remmina.desktop (contents, props changed) Modified: head/net/Makefile head/net/remmina-plugin-i18n/Makefile head/net/remmina-plugin-i18n/pkg-plist (contents, props changed) head/net/remmina-plugin-rdp/Makefile (contents, props changed) head/net/remmina-plugin-telepathy/Makefile (contents, props changed) head/net/remmina-plugin-vnc/Makefile (contents, props changed) head/net/remmina-plugin-xdmcp/Makefile (contents, props changed) head/net/remmina-plugins/Makefile head/net/remmina-plugins/bsd.plugin.mk (contents, props changed) head/net/remmina-plugins/distinfo (contents, props changed) head/net/remmina-plugins/files/patch-vnc_Makefile.in (contents, props changed) head/net/remmina-plugins/pkg-plist.plugin (contents, props changed) head/net/remmina/Makefile head/net/remmina/distinfo (contents, props changed) head/net/remmina/pkg-plist (contents, props changed) Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/Makefile Thu Jun 20 01:59:25 2013 (r321344) @@ -986,7 +986,9 @@ SUBDIR += relayd SUBDIR += remmina SUBDIR += remmina-applet + SUBDIR += remmina-plugin-gnome SUBDIR += remmina-plugin-i18n + SUBDIR += remmina-plugin-nx SUBDIR += remmina-plugin-rdp SUBDIR += remmina-plugin-telepathy SUBDIR += remmina-plugin-vnc Added: head/net/remmina-plugin-gnome/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/remmina-plugin-gnome/Makefile Thu Jun 20 01:59:25 2013 (r321344) @@ -0,0 +1,13 @@ +# Created by: Koichiro IWAO <meta+ports@vmeta.jp> +# $FreeBSD$ + +PKGNAMESUFFIX= -gnome + +MAINTAINER= meta+ports@vmeta.jp +COMMENT= Remmina plugin for GNOME Keyring + +LIB_DEPENDS= gnome-keyring:${PORTSDIR}/security/libgnome-keyring + +MASTERDIR= ${.CURDIR}/../remmina-plugins + +.include "${MASTERDIR}/Makefile" Added: head/net/remmina-plugin-gnome/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/remmina-plugin-gnome/pkg-plist Thu Jun 20 01:59:25 2013 (r321344) @@ -0,0 +1,4 @@ +lib/remmina/plugins/remmina-plugins-gnome.so +@dirrmtry lib/remmina/plugins +@dirrmtry lib/remmina +@dirrmtry include/remmina Modified: head/net/remmina-plugin-i18n/Makefile ============================================================================== --- head/net/remmina-plugin-i18n/Makefile Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina-plugin-i18n/Makefile Thu Jun 20 01:59:25 2013 (r321344) @@ -1,7 +1,4 @@ -# New ports collection makefile for: remmina-plugin-i18n -# Date created: 24 June 2010 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# +# Created by: Alexander Logvinov <avl@FreeBSD.org> # $FreeBSD$ # @@ -11,6 +8,6 @@ COMMENT= Localized messages for Remmina MASTERDIR= ${.CURDIR}/../remmina-plugins -USES= gettext +USES+= gettext .include "${MASTERDIR}/Makefile" Modified: head/net/remmina-plugin-i18n/pkg-plist ============================================================================== --- head/net/remmina-plugin-i18n/pkg-plist Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina-plugin-i18n/pkg-plist Thu Jun 20 01:59:25 2013 (r321344) @@ -22,3 +22,4 @@ share/locale/th/LC_MESSAGES/remmina-plug share/locale/tr/LC_MESSAGES/remmina-plugins.mo share/locale/uk/LC_MESSAGES/remmina-plugins.mo share/locale/zh_CN/LC_MESSAGES/remmina-plugins.mo +@dirrmtry include/remmina Added: head/net/remmina-plugin-nx/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/remmina-plugin-nx/Makefile Thu Jun 20 01:59:25 2013 (r321344) @@ -0,0 +1,15 @@ +# Created by: Koichiro IWAO <meta+ports@vmeta.jp> +# $FreeBSD$ + +PKGNAMESUFFIX= -nx + +MAINTAINER= meta+ports@vmeta.jp +COMMENT= Remmina plugin for NX + +USE_XORG+= xkbfile + +MASTERDIR= ${.CURDIR}/../remmina-plugins + +WITH_NX= yes + +.include "${MASTERDIR}/Makefile" Modified: head/net/remmina-plugin-rdp/Makefile ============================================================================== --- head/net/remmina-plugin-rdp/Makefile Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina-plugin-rdp/Makefile Thu Jun 20 01:59:25 2013 (r321344) @@ -1,15 +1,12 @@ -# New ports collection makefile for: remmina-plugin-rdp -# Date created: 24 June 2010 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# +# Created by: Alexander Logvinov <avl@FreeBSD.org> # $FreeBSD$ -# PKGNAMESUFFIX= -rdp COMMENT= Remmina plugin for RDP protocol -LIB_DEPENDS= freerdp.0:${PORTSDIR}/net/freerdp +BUILD_DEPENDS= freerdp>=1.0.0:${PORTSDIR}/net/freerdp +RUN_DEPENDS= ${BUILD_DEPENDS} MASTERDIR= ${.CURDIR}/../remmina-plugins Modified: head/net/remmina-plugin-telepathy/Makefile ============================================================================== --- head/net/remmina-plugin-telepathy/Makefile Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina-plugin-telepathy/Makefile Thu Jun 20 01:59:25 2013 (r321344) @@ -1,9 +1,5 @@ -# New ports collection makefile for: remmina-plugin-telepathy -# Date created: 24 June 2010 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# +# Created by: Alexander Logvinov <avl@FreeBSD.org> # $FreeBSD$ -# PKGNAMESUFFIX= -telepathy Modified: head/net/remmina-plugin-vnc/Makefile ============================================================================== --- head/net/remmina-plugin-vnc/Makefile Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina-plugin-vnc/Makefile Thu Jun 20 01:59:25 2013 (r321344) @@ -1,15 +1,11 @@ -# New ports collection makefile for: remmina-plugin-vnc -# Date created: 24 June 2010 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# +# Created by: Alexander Logvinov <avl@FreeBSD.org> # $FreeBSD$ -# -PORTREVISION= 2 PKGNAMESUFFIX= -vnc COMMENT= Remmina plugin for VNC protocol +BUILD_DEPENDS= ${LOCALBASE}/include/gcrypt.h:${PORTSDIR}/security/libgcrypt LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ gnutls:${PORTSDIR}/security/gnutls Modified: head/net/remmina-plugin-xdmcp/Makefile ============================================================================== --- head/net/remmina-plugin-xdmcp/Makefile Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina-plugin-xdmcp/Makefile Thu Jun 20 01:59:25 2013 (r321344) @@ -1,9 +1,5 @@ -# New ports collection makefile for: remmina-plugin-xdmcp -# Date created: 24 June 2010 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# +# Created by: Alexander Logvinov <avl@FreeBSD.org> # $FreeBSD$ -# PKGNAMESUFFIX= -xdmcp Modified: head/net/remmina-plugins/Makefile ============================================================================== --- head/net/remmina-plugins/Makefile Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina-plugins/Makefile Thu Jun 20 01:59:25 2013 (r321344) @@ -2,31 +2,41 @@ # $FreeBSD$ PORTNAME?= remmina-plugins -PORTVERSION= 0.9.2 -PORTREVISION?= 1 +PORTVERSION= 1.0.0 CATEGORIES= net gnome -MASTER_SITES= # Empty -DISTFILES?= # Empty +USE_GITHUB= yes +GH_ACCOUNT= FreeRDP +GH_PROJECT= remmina +GH_COMMIT= 356c033 +GH_TAGNAME= ${PORTVERSION} +DISTNAME= remmina-plugins-${PORTVERSION} -MAINTAINER= fluffy@FreeBSD.org + +MAINTAINER?= fluffy@FreeBSD.org COMMENT?= Remmina plugin system .if defined(PKGNAMESUFFIX) .include "${.CURDIR}/../remmina-plugins/bsd.plugin.mk" .else -OPTIONS_DEFINE= RDP VNC XDMCP TELEP -OPTIONS_DEFAULT= RDP VNC XDMCP TELEP +OPTIONS_DEFINE= KEYRING RDP VNC XDMCP TELEP NX +OPTIONS_DEFAULT= KEYRING RDP VNC XDMCP TELEP +KEYRING_DESC= GNOME Keyring plugin RDP_DESC= RDP protocol plugin VNC_DESC= VNC protocol plugin XDMCP_DESC= XDMCP protocol plugin TELEP_DESC= Telepathy protocol plugin +NX_DESC= NX protocol plugin NO_BUILD= yes PATCHDIR= # none .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MKEYRING} +RUN_DEPENDS+= ${LOCALBASE}/lib/remmina/plugins/remmina-plugins-gnome.so:${PORTSDIR}/net/remmina-plugin-gnome +.endif + .if ${PORT_OPTIONS:MRDP} RUN_DEPENDS+= ${LOCALBASE}/lib/remmina/plugins/remmina-plugin-rdp.so:${PORTSDIR}/net/remmina-plugin-rdp .endif @@ -43,6 +53,10 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/remmina/p RUN_DEPENDS+= ${LOCALBASE}/lib/remmina/plugins/remmina-plugin-telepathy.so:${PORTSDIR}/net/remmina-plugin-telepathy .endif +.if ${PORT_OPTIONS:MNX} +RUN_DEPENDS+= ${LOCALBASE}/lib/remmina/plugins/remmina-plugin-nx.so:${PORTSDIR}/net/remmina-plugin-nx +.endif + do-install: # empty .include <bsd.port.mk> Modified: head/net/remmina-plugins/bsd.plugin.mk ============================================================================== --- head/net/remmina-plugins/bsd.plugin.mk Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina-plugins/bsd.plugin.mk Thu Jun 20 01:59:25 2013 (r321344) @@ -2,32 +2,33 @@ PORTNAME= remmina-plugin -MASTER_SITES= SF/remmina/0.9 -DISTNAME= remmina-plugins-${PORTVERSION} -DISTFILES= ${DISTNAME}.tar.gz +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/${PORTNAME}s/COPYING -BUILD_DEPENDS+= ${LOCALBASE}/include/remmina/plugin.h:${PORTSDIR}/net/remmina -RUN_DEPENDS+= remmina:${PORTSDIR}/net/remmina +BUILD_DEPENDS+= remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina +RUN_DEPENDS+= remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina -GNU_CONFIGURE= yes +USES= cmake USE_GMAKE= yes -USE_GNOME= glib20 gtk20 +USE_GNOME= atk desktopfileutils gdkpixbuf2 glib20 gtk20 pango INSTALLS_ICONS= yes LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -CONFIGURE_ARGS+=--disable-nx --disable-rdp --disable-ssh --disable-telepathy \ - --disable-vnc --disable-xdmcp --disable-nls +CFLAGS+= -I${WRKSRC}/remmina/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC +WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-Remmina-${GH_COMMIT} -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING +# disable appindicator as it is new feature of gnome 3 +CMAKE_ARGS+= -DWITH_APPINDICATOR=OFF +# set build directory +CMAKE_ARGS+= --build=build +# prefer gtk2 rather than gtk3 +CMAKE_ARGS+= -DGTK_VERSION=2 .include <bsd.port.pre.mk> -.if ${PKGNAMESUFFIX} == "-i18n" -CONFIGURE_ARGS+=--enable-nls +.if ${PKGNAMESUFFIX} == "-i18n" || ${PKGNAMESUFFIX} == "-gnome" PLIST= ${.CURDIR}/pkg-plist .else -CONFIGURE_ARGS+=--enable${PKGNAMESUFFIX} PLIST_SUB+= PLUGIN="${PKGNAMESUFFIX:S,-,,}" PLIST= ${PKGDIR}/pkg-plist.plugin @@ -38,7 +39,6 @@ PLIST_SUB+= TELEP="@comment " ICONS="" .endif .if ${PORT_OPTIONS:MTELEP} LIB_DEPENDS+= ssh.4:${PORTSDIR}/security/libssh -CONFIGURE_ARGS+=--enable-ssh PLIST_SUB+= SSH="@comment " .if ${OSVERSION} >= 800040 LDFLAGS+= -fstack-protector @@ -46,6 +46,11 @@ LDFLAGS+= -fstack-protector .else PLIST_SUB+= SSH="" .endif +.if ${PORT_OPTIONS:MNX} +PLIST_SUB+= ICONS="" SSH="@comment " +.else +PLIST_SUB+= ICONS="@comment " +.endif .if ${PORT_OPTIONS:MNLS} RUN_DEPENDS+= ${LOCALBASE}/share/locale/bg/LC_MESSAGES/remmina-plugins.mo:${PORTSDIR}/net/remmina-plugin-i18n @@ -53,5 +58,38 @@ RUN_DEPENDS+= ${LOCALBASE}/share/locale/ .endif +post-patch: + @# do not build remmina core program + ${REINPLACE_CMD} -e 's|add_subdirectory(remmina)||' ${WRKSRC}/CMakeLists.txt + ${REINPLACE_CMD} -e 's|find_suggested_package(AVAHI)||' ${WRKSRC}/CMakeLists.txt + @# which plugins to build +.if ${PKGNAMESUFFIX:S,-,,} != "nx" + ${REINPLACE_CMD} -e 's|find_suggested_package(LIBSSH)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt + ${REINPLACE_CMD} -e 's|find_required_package(XKBFILE)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt + ${REINPLACE_CMD} -e 's|add_subdirectory(nx)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt +.endif +.if ${PKGNAMESUFFIX:S,-,,} != "gnome" + ${REINPLACE_CMD} -e 's|add_subdirectory(remmina-plugins-gnome)||' ${WRKSRC}/CMakeLists.txt +.endif +.if ${PKGNAMESUFFIX:S,-,,} != "rdp" + ${REINPLACE_CMD} -e 's|find_suggested_package(FREERDP)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt + ${REINPLACE_CMD} -e 's|add_subdirectory(rdp)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt +.endif +.if ${PKGNAMESUFFIX:S,-,,} != "vnc" + ${REINPLACE_CMD} -e 's|find_suggested_package(GCRYPT)||' ${WRKSRC}/CMakeLists.txt + ${REINPLACE_CMD} -e 's|add_subdirectory(vnc/libvncserver)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt + ${REINPLACE_CMD} -e 's|add_subdirectory(vnc)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt +.endif +.if ${PKGNAMESUFFIX:S,-,,} != "xdmcp" + ${REINPLACE_CMD} -e 's|add_subdirectory(xdmcp)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt +.endif +.if ${PKGNAMESUFFIX:S,-,,} != "telepathy" + ${REINPLACE_CMD} -e 's|find_suggested_package(TELEPATHY)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt + ${REINPLACE_CMD} -e 's|add_subdirectory(telepathy)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt +.endif +.if ${PKGNAMESUFFIX:S,-,,} != "i18n" + ${REINPLACE_CMD} -e 's|add_subdirectory(po)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt +.endif + .include <bsd.port.post.mk> .endif Modified: head/net/remmina-plugins/distinfo ============================================================================== --- head/net/remmina-plugins/distinfo Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina-plugins/distinfo Thu Jun 20 01:59:25 2013 (r321344) @@ -1,2 +1,2 @@ -SHA256 (remmina-plugins-0.9.2.tar.gz) = f2df73a3a8f678f8c186755572072a744302b03b949a328ae1522f8bbb6da762 -SIZE (remmina-plugins-0.9.2.tar.gz) = 542221 +SHA256 (remmina-plugins-1.0.0.tar.gz) = 7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731 +SIZE (remmina-plugins-1.0.0.tar.gz) = 540568 Modified: head/net/remmina-plugins/files/patch-vnc_Makefile.in ============================================================================== --- head/net/remmina-plugins/files/patch-vnc_Makefile.in Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina-plugins/files/patch-vnc_Makefile.in Thu Jun 20 01:59:25 2013 (r321344) @@ -1,16 +0,0 @@ ---- vnc/Makefile.in.orig 2010-06-22 14:55:04.000000000 +1000 -+++ vnc/Makefile.in 2010-06-24 12:32:00.000000000 +1000 -@@ -372,11 +372,11 @@ - @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - remmina_plugin_vnc_la-remminapluginvnc.lo: remminapluginvnc.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remmina_plugin_vnc_la_CFLAGS) $(CFLAGS) -MT remmina_plugin_vnc_la-remminapluginvnc.lo -MD -MP -MF $(DEPDIR)/remmina_plugin_vnc_la-remminapluginvnc.Tpo -c -o remmina_plugin_vnc_la-remminapluginvnc.lo `test -f 'remminapluginvnc.c' || echo '$(srcdir)/'`remminapluginvnc.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(remmina_plugin_vnc_la_CFLAGS) $(CPPFLAGS) $(CFLAGS) -MT remmina_plugin_vnc_la-remminapluginvnc.lo -MD -MP -MF $(DEPDIR)/remmina_plugin_vnc_la-remminapluginvnc.Tpo -c -o remmina_plugin_vnc_la-remminapluginvnc.lo `test -f 'remminapluginvnc.c' || echo '$(srcdir)/'`remminapluginvnc.c - @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/remmina_plugin_vnc_la-remminapluginvnc.Tpo $(DEPDIR)/remmina_plugin_vnc_la-remminapluginvnc.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='remminapluginvnc.c' object='remmina_plugin_vnc_la-remminapluginvnc.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remmina_plugin_vnc_la_CFLAGS) $(CFLAGS) -c -o remmina_plugin_vnc_la-remminapluginvnc.lo `test -f 'remminapluginvnc.c' || echo '$(srcdir)/'`remminapluginvnc.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(remmina_plugin_vnc_la_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o remmina_plugin_vnc_la-remminapluginvnc.lo `test -f 'remminapluginvnc.c' || echo '$(srcdir)/'`remminapluginvnc.c - - mostlyclean-libtool: - -rm -f *.lo Modified: head/net/remmina-plugins/pkg-plist.plugin ============================================================================== --- head/net/remmina-plugins/pkg-plist.plugin Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina-plugins/pkg-plist.plugin Thu Jun 20 01:59:25 2013 (r321344) @@ -1,14 +1,8 @@ -lib/remmina/plugins/remmina-plugin-%%PLUGIN%%.a -lib/remmina/plugins/remmina-plugin-%%PLUGIN%%.la lib/remmina/plugins/remmina-plugin-%%PLUGIN%%.so -%%TELEP%%share/dbus-1/services/org.freedesktop.Telepathy.Client.Remmina.service -%%ICONS%%share/remmina/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%.png -%%ICONS%%%%SSH%%share/remmina/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%-ssh.png -%%ICONS%%share/remmina/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%.png %%ICONS%%%%SSH%%share/remmina/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%-ssh.png -%%TELEP%%share/telepathy/clients/Remmina.client -@dirrmtry lib/remmina/plugins -@dirrmtry lib/remmina +%%ICONS%%share/remmina/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%.png +%%ICONS%%%%SSH%%share/remmina/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%-ssh.png +%%ICONS%%share/remmina/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%.png @dirrmtry share/remmina/icons/hicolor/22x22/emblems @dirrmtry share/remmina/icons/hicolor/22x22 @dirrmtry share/remmina/icons/hicolor/16x16/emblems @@ -16,5 +10,6 @@ lib/remmina/plugins/remmina-plugin-%%PLU @dirrmtry share/remmina/icons/hicolor @dirrmtry share/remmina/icons @dirrmtry share/remmina -%%TELEP%%@dirrmtry share/telepathy/clients -%%TELEP%%@dirrmtry share/telepathy +@dirrmtry lib/remmina/plugins +@dirrmtry lib/remmina +@dirrmtry include/remmina Modified: head/net/remmina/Makefile ============================================================================== --- head/net/remmina/Makefile Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina/Makefile Thu Jun 20 01:59:25 2013 (r321344) @@ -2,39 +2,48 @@ # $FreeBSD$ PORTNAME= remmina -PORTVERSION= 0.9.3 -PORTREVISION= 3 +PORTVERSION= 1.0.0 CATEGORIES= net gnome -MASTER_SITES= SF/${PORTNAME}/0.9 MAINTAINER= fluffy@FreeBSD.org COMMENT= The GTK+ Remote Desktop Client -OPTIONS_DEFINE= SSH GCRYPT TERM AVAHI UNIQUE NLS -OPTIONS_DEFAULT= SSH GCRYPT TERM AVAHI UNIQUE -SSH_DESC= SSH tunneling support -GCRYPT_DESC= libgcrypt support for password encryption -TERM_DESC= terminal support -UNIQUE_DESC= Unique-App support +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/${PORTNAME}/COPYING -GNU_CONFIGURE= yes +USES= cmake desktop-file-utils USE_GMAKE= yes -USE_GNOME= glib20 gtk20 desktopfileutils +USE_GNOME= atk gdkpixbuf2 glib20 gtk20 pango INSTALLS_ICONS= yes LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -Wl,-rpath -Wl,${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CFLAGS+= -I${WRKSRC}/remmina/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC SUB_FILES= pkg-message +USE_GITHUB= yes +GH_ACCOUNT= FreeRDP +GH_PROJECT= ${PORTNAME} +GH_COMMIT= 356c033 +GH_TAGNAME= ${PORTVERSION} +WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-Remmina-${GH_COMMIT} -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING +OPTIONS_DEFINE= SSH GCRYPT TERM AVAHI UNIQUE NLS +OPTIONS_DEFAULT= SSH GCRYPT TERM AVAHI UNIQUE NLS +SSH_DESC= Build with SSH tunneling support +GCRYPT_DESC= Build with libgcrypt support for password encryption +TERM_DESC= Build with terminal support +AVAHI_DESC= Build with Avahi support +UNIQUE_DESC= Build with Unique-App support .include <bsd.port.options.mk> +CMAKE_ARGS+= --build=build +# now cannot build with gtk30 because requisite ports are old +CMAKE_ARGS+= -DGTK_VERSION=2 + .if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else -CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif @@ -45,35 +54,49 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/libssh.so LDFLAGS+= -fstack-protector .endif .else -CONFIGURE_ARGS+=--disable-ssh +CMAKE_ARGS+= -DWITH_SSH=OFF .endif .if ${PORT_OPTIONS:MGCRYPT} LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt .else -CONFIGURE_ARGS+=--disable-gcrypt +CMAKE_ARGS+= -DWITH_GCRYPT=OFF .endif .if ${PORT_OPTIONS:MTERM} USE_GNOME+= vte .else -CONFIGURE_ARGS+=--disable-vte +CMAKE_ARGS+= -DWITH_VTE=OFF .endif .if ${PORT_OPTIONS:MAVAHI} -LIB_DEPENDS+= avahi-ui.0:${PORTSDIR}/net/avahi-gtk +LIB_DEPENDS+= avahi-ui:${PORTSDIR}/net/avahi-gtk .else -CONFIGURE_ARGS+=--disable-avahi +CMAKE_ARGS+= -DWITH_AVAHI=OFF .endif .if ${PORT_OPTIONS:MUNIQUE} -LIB_DEPENDS+= unique-1.0.2:${PORTSDIR}/x11-toolkits/unique +LIB_DEPENDS+= unique:${PORTSDIR}/x11-toolkits/unique .else -CONFIGURE_ARGS+=--disable-unique +CMAKE_ARGS+= -DWITH_UNIQUE=OFF +.endif + +post-patch: + @# fit avahi to current PORTVERSION + ${REINPLACE_CMD} -e's|avahi-ui>=0.6.30|avahi-ui>=0.6.29|' ${WRKSRC}/cmake/FindAVAHI.cmake + ${REINPLACE_CMD} -e's|avahi-client>=0.6.30|avahi-client>=0.6.29|' ${WRKSRC}/cmake/FindAVAHI.cmake + @# do not build plugins and locales , they are provided by separated ports + ${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins)||' ${WRKSRC}/CMakeLists.txt + ${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins-gnome)||' ${WRKSRC}/CMakeLists.txt +.if !${PORT_OPTIONS:MNLS} + ${REINPLACE_CMD} -e's|add_subdirectory(po)||' ${WRKSRC}/remmina/CMakeLists.txt .endif post-install: - @-update-desktop-database + @# localized desktop entry file is not included remmina 1.0.0, install manually + ${MKDIR} ${PREFIX}/share/applications/ + ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications/ + ${CP} -a ${DATADIR}/icons/ ${PREFIX}/share/icons @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Modified: head/net/remmina/distinfo ============================================================================== --- head/net/remmina/distinfo Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina/distinfo Thu Jun 20 01:59:25 2013 (r321344) @@ -1,2 +1,2 @@ -SHA256 (remmina-0.9.3.tar.gz) = ea10eba6f60676f7ebfebd285884e41fbb081f3809064588564f53624a3cee82 -SIZE (remmina-0.9.3.tar.gz) = 389744 +SHA256 (remmina-1.0.0.tar.gz) = 7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731 +SIZE (remmina-1.0.0.tar.gz) = 540568 Added: head/net/remmina/files/patch-remmina_CMakeFiles.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/remmina/files/patch-remmina_CMakeFiles.txt Thu Jun 20 01:59:25 2013 (r321344) @@ -0,0 +1,9 @@ +--- remmina/CMakeLists.txt.orig 2013-05-21 03:32:51.737574552 +0000 ++++ remmina/CMakeLists.txt 2013-05-21 03:33:13.052583969 +0000 +@@ -139,5 +139,5 @@ + install(TARGETS remmina DESTINATION ${CMAKE_INSTALL_BINDIR}) + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remmina.pc.in ${CMAKE_CURRENT_BINARY_DIR}/remmina.pc @ONLY) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina.pc DESTINATION libdata/pkgconfig) + Added: head/net/remmina/files/remmina.desktop ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/remmina/files/remmina.desktop Thu Jun 20 01:59:25 2013 (r321344) @@ -0,0 +1,61 @@ +[Desktop Entry] +Version=1.0 +Name=Remmina Remote Desktop Client +Name[bg]=Клиент за отдалечен достъп Remmina +Name[ca]=Client d'escriptori remot Remmina +Name[cs]=Klient vzdálené plochy Remmina +Name[da]=Remmina Fjernskrivebords Klient +Name[de]=Remmina Betrachter für entfernte Arbeitsflächen +Name[el]=Remmina Απομακρυσμένη Σύνδεση +Name[es]=Cliente de escritorio remoto Remmina +Name[eu]=Remmina, urruneko mahaigainen bezeroa +Name[fr]=Visionneur de bureaux distants Remmina +Name[hu]=Remmina távoli asztal kliens +Name[id]=Remmina Remote Desktop Client +Name[it]=Client di connessione a desktop remoti Remmina +Name[kk]=Remmina қашықтаған жұмыс үстел клиенті +Name[lt]=Remmina nutolusio darbalaukio klientas +Name[nl]=Remmina Extern Bureaublad Client +Name[pl]=Klient zdalnego pulpitu Remmina +Name[pt_BR]=Cliente de área de trabalho remota Remmina +Name[pt_PT]=Visualizador de Área de Trabalho Remota +Name[ru]=Клиент удалённого рабочего стола Remmina +Name[sk]=Klient pripojenia k vzdialenej ploche Remmina +Name[sv]=Remmina - Klient för fjärrskrivbord +Name[th]=Remmina ลูกข่ายพื้นโต๊ะระยะไกล +Name[tr]=Remmina Uzak Masaüstü Bağlantı Aracı +Name[uk]=Клієнт з'єднань з відаленим комп'ютером Remmina +Name[zh_CN]=Remmina 远程桌面客户端 +Comment=Connect to remote desktops +Comment[bg]=Свързване към отдалечени компютри +Comment[ca]=Connecteu-vos a escriptoris remots +Comment[cs]=Připojení ke vzdáleným plochám +Comment[da]=Tilslut fjernskriveborde +Comment[de]=Zu entfernten Arbeitsflächen verbinden +Comment[es]=Conectar a escritorio remoto +Comment[eu]=Konektatu urruneko mahaigainekin +Comment[fr]=Connectez-vous à des bureaux distants +Comment[hu]=Kapcsolódás távoli asztalokhoz +Comment[id]=Mengakses remote desktop +Comment[it]=Connessione a desktop remoti +Comment[kk]=Қашықтаған жұмыс үстелдерге қосылу +Comment[lt]=Jungtis prie nutolusių darbalaukių +Comment[nl]=Verbinding maken met bureaubladen op afstand +Comment[pl]=Łączy ze zdalnymi pulpitami +Comment[pt_BR]=Conecte-se a áreas de trabalho remotas +Comment[pt_PT]=Ligar a áreas de trabalho remotas +Comment[ru]=Подключение к удалённым рабочим столам +Comment[sk]=Pripojenie k vzdialeným plochám +Comment[sv]=Anslut till fjärrskrivbord +Comment[th]=เชื่อมต่อไปยังพื้นโต๊ะระยะไกล +Comment[tr]=Uzak masaüstlerine bağlan +Comment[uk]=З'єднання з відаленим комп'ютером +Comment[zh_CN]=连接到远程桌面 +TryExec=remmina +Exec=remmina +Icon=remmina +Terminal=false +Type=Application +Actions= +Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; + Modified: head/net/remmina/pkg-plist ============================================================================== --- head/net/remmina/pkg-plist Thu Jun 20 00:59:21 2013 (r321343) +++ head/net/remmina/pkg-plist Thu Jun 20 01:59:25 2013 (r321344) @@ -1,60 +1,87 @@ bin/remmina -include/remmina/plugin.h -include/remmina/types.h +libdata/pkgconfig/remmina.pc share/applications/remmina.desktop +share/icons/hicolor/48x48/apps/remmina.png +share/icons/hicolor/24x24/apps/remmina.png +share/icons/hicolor/scalable/apps/remmina.svg +share/icons/hicolor/32x32/apps/remmina.png +share/icons/hicolor/22x22/apps/remmina.png +share/icons/hicolor/22x22/actions/remmina-switch-page.png +share/icons/hicolor/22x22/actions/remmina-fit-window.png +share/icons/hicolor/22x22/actions/remmina-fullscreen.png +share/icons/hicolor/22x22/actions/remmina-scale.png +share/icons/hicolor/22x22/emblems/remmina-sftp.png +share/icons/hicolor/16x16/apps/remmina.png +share/icons/hicolor/16x16/emblems/remmina-sftp.png +share/icons/hicolor/16x16/actions/remmina-switch-page.png +share/icons/hicolor/16x16/actions/remmina-fullscreen.png +share/icons/hicolor/16x16/actions/remmina-scale.png +share/icons/hicolor/16x16/actions/remmina-fit-window.png +share/icons/hicolor/16x16/actions/remmina-pin-up.png +share/icons/hicolor/16x16/actions/remmina-pin-down.png +%%NLS%%share/locale/th/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/el/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/uk/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/de/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/id/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/ru/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/eu/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/sv/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/kk/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/it/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/ca/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/da/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/sk/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/tr/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/bg/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/hu/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/es/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/pl/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/pt_PT/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/lt/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/cs/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/nl/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/fr/LC_MESSAGES/remmina.mo +%%DATADIR%%/icons/hicolor/24x24/apps/remmina.png +%%DATADIR%%/icons/hicolor/48x48/apps/remmina.png +%%DATADIR%%/icons/hicolor/scalable/apps/remmina.svg +%%DATADIR%%/icons/hicolor/16x16/apps/remmina.png +%%DATADIR%%/icons/hicolor/16x16/emblems/remmina-sftp.png +%%DATADIR%%/icons/hicolor/16x16/actions/remmina-pin-down.png %%DATADIR%%/icons/hicolor/16x16/actions/remmina-fit-window.png %%DATADIR%%/icons/hicolor/16x16/actions/remmina-fullscreen.png -%%DATADIR%%/icons/hicolor/16x16/actions/remmina-pin-down.png -%%DATADIR%%/icons/hicolor/16x16/actions/remmina-pin-up.png %%DATADIR%%/icons/hicolor/16x16/actions/remmina-scale.png +%%DATADIR%%/icons/hicolor/16x16/actions/remmina-pin-up.png %%DATADIR%%/icons/hicolor/16x16/actions/remmina-switch-page.png -%%DATADIR%%/icons/hicolor/16x16/emblems/remmina-sftp.png -%%DATADIR%%/icons/hicolor/22x22/actions/remmina-fit-window.png -%%DATADIR%%/icons/hicolor/22x22/actions/remmina-fullscreen.png +%%DATADIR%%/icons/hicolor/32x32/apps/remmina.png +%%DATADIR%%/icons/hicolor/22x22/apps/remmina.png %%DATADIR%%/icons/hicolor/22x22/actions/remmina-scale.png %%DATADIR%%/icons/hicolor/22x22/actions/remmina-switch-page.png +%%DATADIR%%/icons/hicolor/22x22/actions/remmina-fullscreen.png +%%DATADIR%%/icons/hicolor/22x22/actions/remmina-fit-window.png %%DATADIR%%/icons/hicolor/22x22/emblems/remmina-sftp.png -%%NLS%%share/locale/bg/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/ca/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/cs/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/da/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/de/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/el/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/es/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/eu/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/fr/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/hu/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/id/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/it/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/kk/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/lt/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/nl/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/pl/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/pt_PT/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/ru/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/sk/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/sv/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/th/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/tr/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/uk/LC_MESSAGES/remmina.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/remmina.mo -share/icons/hicolor/16x16/apps/remmina.png -share/icons/hicolor/22x22/apps/remmina.png -share/icons/hicolor/24x24/apps/remmina.png -share/icons/hicolor/32x32/apps/remmina.png -share/icons/hicolor/48x48/apps/remmina.png -share/icons/hicolor/scalable/apps/remmina.svg @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@dirrm include/remmina -@dirrm %%DATADIR%%/icons/hicolor/22x22/actions +@dirrmtry %%DATADIR%%/icons/hicolor/scalable/apps +@dirrmtry %%DATADIR%%/icons/hicolor/scalable +@dirrmtry %%DATADIR%%/icons/hicolor/48x48/apps +@dirrmtry %%DATADIR%%/icons/hicolor/48x48 +@dirrmtry %%DATADIR%%/icons/hicolor/32x32/apps +@dirrmtry %%DATADIR%%/icons/hicolor/32x32 +@dirrmtry %%DATADIR%%/icons/hicolor/24x24/apps +@dirrmtry %%DATADIR%%/icons/hicolor/24x24 +@dirrmtry %%DATADIR%%/icons/hicolor/22x22/actions +@dirrmtry %%DATADIR%%/icons/hicolor/22x22/apps @dirrmtry %%DATADIR%%/icons/hicolor/22x22/emblems @dirrmtry %%DATADIR%%/icons/hicolor/22x22 -@dirrm %%DATADIR%%/icons/hicolor/16x16/actions +@dirrmtry %%DATADIR%%/icons/hicolor/16x16/actions +@dirrmtry %%DATADIR%%/icons/hicolor/16x16/apps @dirrmtry %%DATADIR%%/icons/hicolor/16x16/emblems @dirrmtry %%DATADIR%%/icons/hicolor/16x16 @dirrmtry %%DATADIR%%/icons/hicolor @dirrmtry %%DATADIR%%/icons @dirrmtry %%DATADIR%% @dirrmtry share/applications +@dirrmtry include/remmina
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306200159.r5K1xP5g075748>