- Update FreeRDP to 1.1.0.2013070101 beta release

- Update Remmina and Remmina plugins collection to git commit b6a55ae - Use new style for LIB_DEPENDS - Stagify
svn path=/head/; revision=339755
2024-12-23 04:23:08 +00:00 · 2014-01-15 05:44:43 +00:00 · 2014-01-15 05:44:43 +00:00 · a9d0d9504b · 2021-03-31 03:12:20 +00:00
commit a9d0d9504b
parent 2e0636b6e7
28 changed files with 29039 additions and 891 deletions
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@ -2,7 +2,8 @@
 # $FreeBSD$

 PORTNAME=	freerdp
-PORTVERSION=	1.0.2
+PORTVERSION=	1.1.0.b20130711
+DISTVERSION=	1.1.0-beta+2013071101
 CATEGORIES=	net comms ipv6

 MAINTAINER=	fluffy@FreeBSD.org
@ -17,18 +18,17 @@ USES=		cmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeRDP
 GH_PROJECT=	FreeRDP
-GH_COMMIT=	616aed4
+GH_COMMIT=	780d451
 GH_TAGNAME=	${GH_COMMIT}

 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${WRKSRC}/include -I${LOCALBASE}/include

-OPTIONS_DEFINE=	ALSA CUPS DIRECTFB FFMPEG PULSEAUDIO SSE X11
-OPTIONS_DEFAULT=	CUPS PULSEAUDIO X11
+OPTIONS_DEFINE=	ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11
+OPTIONS_DEFAULT=	CUPS GSTREAMER PULSEAUDIO X11
 X11_DESC=	Build FreeRDP X11 client
 DIRECTFB_DESC=	Build FreeRDP DirectFB client

-NO_STAGE=	yes
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MX11}
@ -43,7 +43,7 @@ PLIST_SUB+=	X11="@comment "
 .endif

 .if ${PORT_OPTIONS:MDIRECTFB}
-LIB_DEPENDS+=	directfb:${PORTSDIR}/devel/directfb
+LIB_DEPENDS+=	libdirectfb.so:${PORTSDIR}/devel/directfb
 CMAKE_ARGS+=	-DWITH_DIRECTFB=ON
 PLIST_SUB+=	DIRECTFB=""
 # currently DirectFB option fails with clang
@ -53,7 +53,7 @@ PLIST_SUB+=	DIRECTFB="@comment "
 .endif

 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
 PLIST_SUB+=	ALSA=""
 .else
 PLIST_SUB+=	ALSA="@comment "
@ -69,20 +69,27 @@ CMAKE_ARGS+=	-DWITH_FFMPEG=OFF
 PLIST_SUB+=	FFMPEG="@comment "
 .endif

+.if ${PORT_OPTIONS:MGSTREAMER}
+CMAKE_ARGS+=	-DWITH_GSTREAMER=ON
+USE_GSTREAMER=	yes
+.else
+CMAKE_ARGS+=	-DWITH_GSTREAMER=OFF
+.endif
+
 .if ${PORT_OPTIONS:MCUPS}
 CMAKE_ARGS+=	-DWITH_CUPS=ON
-LIB_DEPENDS+=	cups:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client
 .else
 CMAKE_ARGS+=	-DWITH_CUPS=OFF
 .endif

 .if ${PORT_OPTIONS:MPULSEAUDIO}
-CMAKE_ARGS+=	-DWITH_PULSEAUDIO=ON
-LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+CMAKE_ARGS+=	-DWITH_PULSE=ON
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	PULSE=""
 .else
 PLIST_SUB+=	PULSE="@comment "
-CMAKE_ARGS+=	-DWITH_PULSEAUDIO=OFF
+CMAKE_ARGS+=	-DWITH_PULSE=OFF
 .endif

 .if ${PORT_OPTIONS:MSSE}
@ -93,7 +100,13 @@ CMAKE_ARGS+=	-DWITH_SSE2=OFF

 post-extract:
 	${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \
+		-e '/CMAKE_INSTALL_RPATH /d' \
 		${WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \
 		${WRKSRC}/client/X11/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|HW_AVAILCPU|HW_NCPU|' \
+		${WRKSRC}/winpr/libwinpr/sysinfo/sysinfo.c
+	${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
+		${WRKSRC}/winpr/libwinpr/crt/alignment.c \
+		${WRKSRC}/channels/drive/client/statvfs.c
 .include <bsd.port.mk>
--- a/net/freerdp/distinfo
+++ b/net/freerdp/distinfo
@ -1,2 +1,2 @@
-SHA256 (freerdp-1.0.2.tar.gz) = 0b12eca36a97327a3202866a08a3afef645e4e4534dfca2138449246fac4ff6a
-SIZE (freerdp-1.0.2.tar.gz) = 3506618
+SHA256 (freerdp-1.1.0-beta+2013071101.tar.gz) = ead34bb077451190abc177c5fda036b74191dba02045d69b59d0b9f29e9a1b38
+SIZE (freerdp-1.1.0-beta+2013071101.tar.gz) = 6677686
--- a/net/freerdp/files/patch-channels-drdynvc-tsmf-ffmpeg-tsmf_ffmpeg.c
+++ b/net/freerdp/files/patch-channels-drdynvc-tsmf-ffmpeg-tsmf_ffmpeg.c
@ -1,36 +0,0 @@
--- channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c.orig	2013-10-25 08:48:35.385869420 -0200
-+++ channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c	2013-10-25 08:54:54.476872888 -0200
-@@ -34,12 +34,16 @@
- #define AVMEDIA_TYPE_AUDIO 1
- #endif
- 
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
-+#endif
-+
- typedef struct _TSMFFFmpegDecoder
- {
- 	ITSMFDecoder iface;
- 
- 	int media_type;
-	enum CodecID codec_id;
-+	enum AVCodecID codec_id;
- 	AVCodecContext* codec_context;
- 	AVCodec* codec;
- 	AVFrame* frame;
-@@ -89,13 +93,9 @@
- 	mdecoder->codec_context->block_align = media_type->BlockAlign;
- 
- #ifdef AV_CPU_FLAG_SSE2
-	mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
-+	av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2);
- #else
-#if LIBAVCODEC_VERSION_MAJOR < 53
-	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
-#else
-	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
-#endif
-+	av_set_cpu_flags_mask(FF_MM_SSE2 | FF_MM_MMX2);
- #endif
- 
- 	return true;
--- a/net/freerdp/files/patch-channels-tsmf-client-ffmpeg-tsmf_ffmpeg.c
+++ b/net/freerdp/files/patch-channels-tsmf-client-ffmpeg-tsmf_ffmpeg.c
@ -0,0 +1,36 @@
+--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig	2013-07-10 01:00:21.000000000 -0700
+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c	2013-08-12 22:26:28.000000000 -0700
+@@ -43,12 +43,20 @@
+ #define AVMEDIA_TYPE_AUDIO 1
+ #endif
+ 
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
+
+ typedef struct _TSMFFFmpegDecoder
+ {
+ 	ITSMFDecoder iface;
+ 
+ 	int media_type;
+#if LIBAVCODEC_VERSION_MAJOR > 54
+	enum AVCodecID codec_id;
+#else
+ 	enum CodecID codec_id;
+#endif
+ 	AVCodecContext* codec_context;
+ 	AVCodec* codec;
+ 	AVFrame* frame;
+@@ -99,8 +107,12 @@
+ 	mdecoder->codec_context->block_align = media_type->BlockAlign;
+ 
+ #ifdef AV_CPU_FLAG_SSE2
+#if LIBAVCODEC_VERSION_MAJOR < 55
+ 	mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
+ #else
+	av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2); 
+#endif
+#else
+ #if LIBAVCODEC_VERSION_MAJOR < 53
+ 	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
+ #else
--- a/net/freerdp/files/patch-libfreerdp-codec_CMakeLists.txt
+++ b/net/freerdp/files/patch-libfreerdp-codec_CMakeLists.txt
@ -1,11 +0,0 @@
--- libfreerdp-codec/CMakeLists.txt.orig	2013-01-02 21:46:59.000000000 +0000
-+++ libfreerdp-codec/CMakeLists.txt	2013-02-27 09:09:10.180252424 +0000
-@@ -46,7 +46,7 @@
- 	rfx_sse2.c
- 	rfx_sse2.h
- )
-	set_property(SOURCE rfx_sse2.c PROPERTY COMPILE_FLAGS "-msse2")
-+	set_property(SOURCE rfx_sse2.c nsc_sse2.c PROPERTY COMPILE_FLAGS "-msse2")
- endif()
- 
- if(WITH_NEON)
--- a/net/freerdp/files/patch-libfreerdp-codec_color.c
+++ b/net/freerdp/files/patch-libfreerdp-codec_color.c
@ -1,40 +0,0 @@
-diff --git a/libfreerdp-codec/color.c b/libfreerdp-codec/color.c
-index dc77707..ee3c1fa 100644
--- libfreerdp-codec/color.c
-+++ libfreerdp-codec/color.c
-@@ -86,7 +86,7 @@ void freerdp_set_pixel(uint8* data, int x, int y, int width, int height, int bpp
- 	}
- }
- 
-INLINE void freerdp_color_split_rgb(uint32* color, int bpp, uint8* red, uint8* green, uint8* blue, uint8* alpha, HCLRCONV clrconv)
-+static INLINE void freerdp_color_split_rgb(uint32* color, int bpp, uint8* red, uint8* green, uint8* blue, uint8* alpha, HCLRCONV clrconv)
- {
- 	*red = *green = *blue = 0;
- 	*alpha = (clrconv->alpha) ? 0xFF : 0x00;
-@@ -137,7 +137,7 @@ INLINE void freerdp_color_split_rgb(uint32* color, int bpp, uint8* red, uint8* g
- 	}
- }
- 
-INLINE void freerdp_color_split_bgr(uint32* color, int bpp, uint8* red, uint8* green, uint8* blue, uint8* alpha, HCLRCONV clrconv)
-+static INLINE void freerdp_color_split_bgr(uint32* color, int bpp, uint8* red, uint8* green, uint8* blue, uint8* alpha, HCLRCONV clrconv)
- {
- 	*red = *green = *blue = 0;
- 	*alpha = (clrconv->alpha) ? 0xFF : 0x00;
-@@ -188,7 +188,7 @@ INLINE void freerdp_color_split_bgr(uint32* color, int bpp, uint8* red, uint8* g
- 	}
- }
- 
-INLINE void freerdp_color_make_rgb(uint32* color, int bpp, uint8* red, uint8* green, uint8* blue, uint8* alpha, HCLRCONV clrconv)
-+static INLINE void freerdp_color_make_rgb(uint32* color, int bpp, uint8* red, uint8* green, uint8* blue, uint8* alpha, HCLRCONV clrconv)
- {
- 	switch (bpp)
- 	{
-@@ -229,7 +229,7 @@ INLINE void freerdp_color_make_rgb(uint32* color, int bpp, uint8* red, uint8* gr
- 	}
- }
- 
-INLINE void freerdp_color_make_bgr(uint32* color, int bpp, uint8* red, uint8* green, uint8* blue, uint8* alpha, HCLRCONV clrconv)
-+static INLINE void freerdp_color_make_bgr(uint32* color, int bpp, uint8* red, uint8* green, uint8* blue, uint8* alpha, HCLRCONV clrconv)
- {
- 	switch (bpp)
- 	{
--- a/net/freerdp/files/patch-libfreerdp-core_fastpath.c
+++ b/net/freerdp/files/patch-libfreerdp-core_fastpath.c
@ -1,22 +0,0 @@
-diff --git a/libfreerdp-core/fastpath.c b/libfreerdp-core/fastpath.c
-index dc9caac..587c316 100644
--- libfreerdp-core/fastpath.c
-+++ libfreerdp-core/fastpath.c
-@@ -82,7 +82,7 @@ uint16 fastpath_read_header(rdpFastPath* fastpath, STREAM* s)
- 	return length;
- }
- 
-INLINE void fastpath_read_update_header(STREAM* s, uint8* updateCode, uint8* fragmentation, uint8* compression)
-+static INLINE void fastpath_read_update_header(STREAM* s, uint8* updateCode, uint8* fragmentation, uint8* compression)
- {
- 	uint8 updateHeader;
- 
-@@ -92,7 +92,7 @@ INLINE void fastpath_read_update_header(STREAM* s, uint8* updateCode, uint8* fra
- 	*compression = (updateHeader >> 6) & 0x03;
- }
- 
-INLINE void fastpath_write_update_header(STREAM* s, uint8 updateCode, uint8 fragmentation, uint8 compression)
-+static INLINE void fastpath_write_update_header(STREAM* s, uint8 updateCode, uint8 fragmentation, uint8 compression)
- {
- 	uint8 updateHeader = 0;
- 
--- a/net/freerdp/files/patch-libfreerdp-core_orders.c
+++ b/net/freerdp/files/patch-libfreerdp-core_orders.c
@ -1,121 +0,0 @@
-diff --git a/libfreerdp-core/orders.c b/libfreerdp-core/orders.c
-index 1ee0b89..6c33805 100644
--- libfreerdp-core/orders.c
-+++ libfreerdp-core/orders.c
-@@ -138,7 +138,7 @@ static const uint8 BMF_BPP[] =
- 		0, 1, 0, 8, 16, 24, 32
- };
- 
-INLINE void update_read_coord(STREAM* s, sint32* coord, boolean delta)
-+static INLINE void update_read_coord(STREAM* s, sint32* coord, boolean delta)
- {
- 	sint8 lsi8;
- 	sint16 lsi16;
-@@ -155,7 +155,7 @@ INLINE void update_read_coord(STREAM* s, sint32* coord, boolean delta)
- 	}
- }
- 
-INLINE void update_read_color(STREAM* s, uint32* color)
-+static INLINE void update_read_color(STREAM* s, uint32* color)
- {
- 	uint8 byte;
- 
-@@ -167,7 +167,7 @@ INLINE void update_read_color(STREAM* s, uint32* color)
- 	*color |= (byte << 16);
- }
- 
-INLINE void update_read_colorref(STREAM* s, uint32* color)
-+static INLINE void update_read_colorref(STREAM* s, uint32* color)
- {
- 	uint8 byte;
- 
-@@ -180,7 +180,7 @@ INLINE void update_read_colorref(STREAM* s, uint32* color)
- 	stream_seek_uint8(s);
- }
- 
-INLINE void update_read_color_quad(STREAM* s, uint32* color)
-+static INLINE void update_read_color_quad(STREAM* s, uint32* color)
- {
- 	uint8 byte;
- 
-@@ -193,7 +193,7 @@ INLINE void update_read_color_quad(STREAM* s, uint32* color)
- 	stream_seek_uint8(s);
- }
- 
-INLINE void update_read_2byte_unsigned(STREAM* s, uint32* value)
-+static INLINE void update_read_2byte_unsigned(STREAM* s, uint32* value)
- {
- 	uint8 byte;
- 
-@@ -211,7 +211,7 @@ INLINE void update_read_2byte_unsigned(STREAM* s, uint32* value)
- 	}
- }
- 
-INLINE void update_read_2byte_signed(STREAM* s, sint32* value)
-+static INLINE void update_read_2byte_signed(STREAM* s, sint32* value)
- {
- 	uint8 byte;
- 	boolean negative;
-@@ -232,7 +232,7 @@ INLINE void update_read_2byte_signed(STREAM* s, sint32* value)
- 		*value *= -1;
- }
- 
-INLINE void update_read_4byte_unsigned(STREAM* s, uint32* value)
-+static INLINE void update_read_4byte_unsigned(STREAM* s, uint32* value)
- {
- 	uint8 byte;
- 	uint8 count;
-@@ -276,7 +276,7 @@ INLINE void update_read_4byte_unsigned(STREAM* s, uint32* value)
- 	}
- }
- 
-INLINE void update_read_delta(STREAM* s, sint32* value)
-+static INLINE void update_read_delta(STREAM* s, sint32* value)
- {
- 	uint8 byte;
- 
-@@ -294,7 +294,7 @@ INLINE void update_read_delta(STREAM* s, sint32* value)
- 	}
- }
- 
-INLINE void update_read_glyph_delta(STREAM* s, uint16* value)
-+static INLINE void update_read_glyph_delta(STREAM* s, uint16* value)
- {
- 	uint8 byte;
- 
-@@ -306,7 +306,7 @@ INLINE void update_read_glyph_delta(STREAM* s, uint16* value)
- 		*value = (byte & 0x3F);
- }
- 
-INLINE void update_seek_glyph_delta(STREAM* s)
-+static INLINE void update_seek_glyph_delta(STREAM* s)
- {
- 	uint8 byte;
- 
-@@ -316,7 +316,7 @@ INLINE void update_seek_glyph_delta(STREAM* s)
- 		stream_seek_uint8(s);
- }
- 
-INLINE void update_read_brush(STREAM* s, rdpBrush* brush, uint8 fieldFlags)
-+static INLINE void update_read_brush(STREAM* s, rdpBrush* brush, uint8 fieldFlags)
- {
- 	if (fieldFlags & ORDER_FIELD_01)
- 		stream_read_uint8(s, brush->x);
-@@ -354,7 +354,7 @@ INLINE void update_read_brush(STREAM* s, rdpBrush* brush, uint8 fieldFlags)
- 	}
- }
- 
-INLINE void update_read_delta_rects(STREAM* s, DELTA_RECT* rectangles, int number)
-+static INLINE void update_read_delta_rects(STREAM* s, DELTA_RECT* rectangles, int number)
- {
- 	int i;
- 	uint8 flags = 0;
-@@ -399,7 +399,7 @@ INLINE void update_read_delta_rects(STREAM* s, DELTA_RECT* rectangles, int numbe
- 	}
- }
- 
-INLINE void update_read_delta_points(STREAM* s, DELTA_POINT* points, int number, sint16 x, sint16 y)
-+static INLINE void update_read_delta_points(STREAM* s, DELTA_POINT* points, int number, sint16 x, sint16 y)
- {
- 	int i;
- 	uint8 flags = 0;
--- a/net/freerdp/files/patch-libfreerdp-gdi_16bpp.c
+++ b/net/freerdp/files/patch-libfreerdp-gdi_16bpp.c
@ -1,117 +0,0 @@
-diff --git a/libfreerdp-gdi/16bpp.c b/libfreerdp-gdi/16bpp.c
-index 22b0009..46ca0df 100644
--- libfreerdp-gdi/16bpp.c
-+++ libfreerdp-gdi/16bpp.c
-@@ -878,96 +878,96 @@ int PatBlt_16bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, i
- 	return 1;
- }
- 
-INLINE void SetPixel_BLACK_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_BLACK_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = 0 */
- 	*pixel = 0;
- }
- 
-INLINE void SetPixel_NOTMERGEPEN_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_NOTMERGEPEN_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = ~(D | P) */
- 	*pixel = ~(*pixel | *pen);
- }
- 
-INLINE void SetPixel_MASKNOTPEN_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_MASKNOTPEN_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = D & ~P */
- 	*pixel &= ~(*pen);
- }
- 
-INLINE void SetPixel_NOTCOPYPEN_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_NOTCOPYPEN_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = ~P */
- 	*pixel = ~(*pen);
- }
- 
-INLINE void SetPixel_MASKPENNOT_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_MASKPENNOT_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = P & ~D */
- 	*pixel = *pen & ~*pixel;
- }
- 
-INLINE void SetPixel_NOT_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_NOT_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = ~D */
- 	*pixel = ~(*pixel);
- }
- 
-INLINE void SetPixel_XORPEN_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_XORPEN_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = D ^ P */
- 	*pixel = *pixel ^ *pen;
- }
- 
-INLINE void SetPixel_NOTMASKPEN_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_NOTMASKPEN_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = ~(D & P) */
- 	*pixel = ~(*pixel & *pen);
- }
- 
-INLINE void SetPixel_MASKPEN_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_MASKPEN_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = D & P */
- 	*pixel &= *pen;
- }
- 
-INLINE void SetPixel_NOTXORPEN_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_NOTXORPEN_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = ~(D ^ P) */
- 	*pixel = ~(*pixel ^ *pen);
- }
- 
-INLINE void SetPixel_NOP_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_NOP_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = D */
- }
- 
-INLINE void SetPixel_MERGENOTPEN_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_MERGENOTPEN_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = D | ~P */
- 	*pixel |= ~(*pen);
- }
- 
-INLINE void SetPixel_COPYPEN_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_COPYPEN_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = P */
- 	*pixel = *pen;
- }
- 
-INLINE void SetPixel_MERGEPENNOT_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_MERGEPENNOT_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = P | ~D */
- 	*pixel = *pen | ~(*pixel);
- }
- 
-INLINE void SetPixel_MERGEPEN_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_MERGEPEN_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = P | D */
- 	*pixel |= *pen;
- }
- 
-INLINE void SetPixel_WHITE_16bpp(uint16 *pixel, uint16 *pen)
-+static INLINE void SetPixel_WHITE_16bpp(uint16 *pixel, uint16 *pen)
- {
- 	/* D = 1 */
- 	*pixel = 0xFFFF;
--- a/net/freerdp/files/patch-libfreerdp-gdi_32bpp.c
+++ b/net/freerdp/files/patch-libfreerdp-gdi_32bpp.c
@ -1,117 +0,0 @@
-diff --git a/libfreerdp-gdi/32bpp.c b/libfreerdp-gdi/32bpp.c
-index 8ed8553..0d5fbd2 100644
--- libfreerdp-gdi/32bpp.c
-+++ libfreerdp-gdi/32bpp.c
-@@ -920,96 +920,96 @@ int PatBlt_32bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, i
- 	return 1;
- }
- 
-INLINE void SetPixel_BLACK_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_BLACK_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = 0 */
- 	*pixel = 0;
- }
- 
-INLINE void SetPixel_NOTMERGEPEN_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_NOTMERGEPEN_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = ~(D | P) */
- 	*pixel = ~(*pixel | *pen);
- }
- 
-INLINE void SetPixel_MASKNOTPEN_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_MASKNOTPEN_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = D & ~P */
- 	*pixel &= ~(*pen);
- }
- 
-INLINE void SetPixel_NOTCOPYPEN_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_NOTCOPYPEN_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = ~P */
- 	*pixel = ~(*pen);
- }
- 
-INLINE void SetPixel_MASKPENNOT_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_MASKPENNOT_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = P & ~D */
- 	*pixel = *pen & ~*pixel;
- }
- 
-INLINE void SetPixel_NOT_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_NOT_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = ~D */
- 	*pixel = ~(*pixel);
- }
- 
-INLINE void SetPixel_XORPEN_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_XORPEN_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = D ^ P */
- 	*pixel = *pixel ^ *pen;
- }
- 
-INLINE void SetPixel_NOTMASKPEN_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_NOTMASKPEN_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = ~(D & P) */
- 	*pixel = ~(*pixel & *pen);
- }
- 
-INLINE void SetPixel_MASKPEN_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_MASKPEN_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = D & P */
- 	*pixel &= *pen;
- }
- 
-INLINE void SetPixel_NOTXORPEN_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_NOTXORPEN_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = ~(D ^ P) */
- 	*pixel = ~(*pixel ^ *pen);
- }
- 
-INLINE void SetPixel_NOP_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_NOP_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = D */
- }
- 
-INLINE void SetPixel_MERGENOTPEN_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_MERGENOTPEN_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = D | ~P */
- 	*pixel |= ~(*pen);
- }
- 
-INLINE void SetPixel_COPYPEN_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_COPYPEN_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = P */
- 	*pixel = *pen;
- }
- 
-INLINE void SetPixel_MERGEPENNOT_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_MERGEPENNOT_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = P | ~D */
- 	*pixel = *pen | ~(*pixel);
- }
- 
-INLINE void SetPixel_MERGEPEN_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_MERGEPEN_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = P | D */
- 	*pixel |= *pen;
- }
- 
-INLINE void SetPixel_WHITE_32bpp(uint32* pixel, uint32* pen)
-+static INLINE void SetPixel_WHITE_32bpp(uint32* pixel, uint32* pen)
- {
- 	/* D = 1 */
- 	*pixel = 0xFFFFFF;
--- a/net/freerdp/files/patch-libfreerdp-gdi_8bpp.c
+++ b/net/freerdp/files/patch-libfreerdp-gdi_8bpp.c
@ -1,117 +0,0 @@
-diff --git a/libfreerdp-gdi/8bpp.c b/libfreerdp-gdi/8bpp.c
-index e10dde4..bddf327 100644
--- libfreerdp-gdi/8bpp.c
-+++ libfreerdp-gdi/8bpp.c
-@@ -793,96 +793,96 @@ int PatBlt_8bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, in
- 	return 1;
- }
- 
-INLINE void SetPixel_BLACK_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_BLACK_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = 0 */
- 	*pixel = 0;
- }
- 
-INLINE void SetPixel_NOTMERGEPEN_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_NOTMERGEPEN_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = ~(D | P) */
- 	*pixel = ~(*pixel | *pen);
- }
- 
-INLINE void SetPixel_MASKNOTPEN_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_MASKNOTPEN_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = D & ~P */
- 	*pixel &= ~(*pen);
- }
- 
-INLINE void SetPixel_NOTCOPYPEN_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_NOTCOPYPEN_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = ~P */
- 	*pixel = ~(*pen);
- }
- 
-INLINE void SetPixel_MASKPENNOT_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_MASKPENNOT_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = P & ~D */
- 	*pixel = *pen & ~*pixel;
- }
- 
-INLINE void SetPixel_NOT_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_NOT_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = ~D */
- 	*pixel = ~(*pixel);
- }
- 
-INLINE void SetPixel_XORPEN_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_XORPEN_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = D ^ P */
- 	*pixel = *pixel ^ *pen;
- }
- 
-INLINE void SetPixel_NOTMASKPEN_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_NOTMASKPEN_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = ~(D & P) */
- 	*pixel = ~(*pixel & *pen);
- }
- 
-INLINE void SetPixel_MASKPEN_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_MASKPEN_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = D & P */
- 	*pixel &= *pen;
- }
- 
-INLINE void SetPixel_NOTXORPEN_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_NOTXORPEN_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = ~(D ^ P) */
- 	*pixel = ~(*pixel ^ *pen);
- }
- 
-INLINE void SetPixel_NOP_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_NOP_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = D */
- }
- 
-INLINE void SetPixel_MERGENOTPEN_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_MERGENOTPEN_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = D | ~P */
- 	*pixel |= ~(*pen);
- }
- 
-INLINE void SetPixel_COPYPEN_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_COPYPEN_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = P */
- 	*pixel = *pen;
- }
- 
-INLINE void SetPixel_MERGEPENNOT_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_MERGEPENNOT_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = P | ~D */
- 	*pixel = *pen | ~(*pixel);
- }
- 
-INLINE void SetPixel_MERGEPEN_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_MERGEPEN_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = P | D */
- 	*pixel |= *pen;
- }
- 
-INLINE void SetPixel_WHITE_8bpp(uint8* pixel, uint8* pen)
-+static INLINE void SetPixel_WHITE_8bpp(uint8* pixel, uint8* pen)
- {
- 	/* D = 1 */
- 	*pixel = 0xFF;
--- a/net/freerdp/files/patch-libfreerdp-locale-timezone.c
+++ b/net/freerdp/files/patch-libfreerdp-locale-timezone.c
@ -0,0 +1,14 @@
+--- libfreerdp/locale/timezone.c.orig	2013-07-10 19:00:21.000000000 +1100
+++ libfreerdp/locale/timezone.c	2014-01-08 03:32:36.919691015 +1100
+@@ -1663,7 +1663,10 @@
+ 	local_time = localtime(&t);
+ 
+ #ifdef HAVE_TM_GMTOFF
+-    clientTimeZone->bias = timezone / 60;
+  if (local_time->tm_gmtoff >= 0)
+    clientTimeZone->bias = (UINT32) (local_time->tm_gmtoff / 60);
+  else
+    clientTimeZone->bias = (UINT32) (1440 + (INT32) (local_time->tm_gmtoff / 60));
+ 	DEBUG_TIMEZONE("tzname[std]: %s, tzname[dst]: %s, timezone: %ld, Daylight: %d", tzname[0], tzname[1], timezone, daylight);
+ #elif defined(sun)
+ 	if (local_time->tm_isdst > 0)
--- a/net/freerdp/pkg-plist
+++ b/net/freerdp/pkg-plist
@ -1,22 +1,48 @@
 %%DIRECTFB%%bin/dfreerdp
 bin/xfreerdp
+include/freerdp/addin.h
 include/freerdp/altsec.h
 include/freerdp/api.h
 include/freerdp/cache/bitmap.h
 include/freerdp/cache/brush.h
 include/freerdp/cache/cache.h
 include/freerdp/cache/glyph.h
+include/freerdp/cache/nine_grid.h
 include/freerdp/cache/offscreen.h
 include/freerdp/cache/palette.h
 include/freerdp/cache/pointer.h
 include/freerdp/channels/channels.h
+include/freerdp/channels/rdpdr.h
+include/freerdp/channels/rdpsnd.h
 include/freerdp/channels/wtsvc.h
+include/freerdp/client.h
+include/freerdp/client/channels.h
+include/freerdp/client/cliprdr.h
+include/freerdp/client/cmdline.h
+include/freerdp/client/drdynvc.h
+include/freerdp/client/file.h
+include/freerdp/client/rdpei.h
+include/freerdp/client/tsmf.h
+include/freerdp/codec/audio.h
 include/freerdp/codec/bitmap.h
 include/freerdp/codec/color.h
+include/freerdp/codec/dsp.h
+include/freerdp/codec/jpeg.h
+include/freerdp/codec/mppc_dec.h
+include/freerdp/codec/mppc_enc.h
 include/freerdp/codec/nsc.h
 include/freerdp/codec/rfx.h
 include/freerdp/constants.h
+include/freerdp/crypto/ber.h
+include/freerdp/crypto/certificate.h
+include/freerdp/crypto/crypto.h
+include/freerdp/crypto/der.h
+include/freerdp/crypto/er.h
+include/freerdp/crypto/per.h
+include/freerdp/crypto/tls.h
 include/freerdp/dvc.h
+include/freerdp/error.h
+include/freerdp/event.h
 include/freerdp/extension.h
 include/freerdp/freerdp.h
 include/freerdp/gdi/16bpp.h
@ -35,131 +61,232 @@ include/freerdp/gdi/region.h
 include/freerdp/gdi/shape.h
 include/freerdp/graphics.h
 include/freerdp/input.h
-include/freerdp/kbd/kbd.h
-include/freerdp/kbd/layouts.h
-include/freerdp/kbd/locales.h
-include/freerdp/kbd/vkcodes.h
 include/freerdp/listener.h
+include/freerdp/locale/keyboard.h
+include/freerdp/locale/locale.h
+include/freerdp/locale/timezone.h
+include/freerdp/message.h
 include/freerdp/peer.h
-include/freerdp/plugins/cliprdr.h
-include/freerdp/plugins/tsmf.h
 include/freerdp/pointer.h
 include/freerdp/primary.h
+include/freerdp/primitives.h
 include/freerdp/rail.h
 include/freerdp/rail/icon.h
 include/freerdp/rail/rail.h
 include/freerdp/rail/window.h
 include/freerdp/rail/window_list.h
+include/freerdp/scancode.h
 include/freerdp/secondary.h
+include/freerdp/server/audin.h
+include/freerdp/server/channels.h
+include/freerdp/server/rdpsnd.h
 include/freerdp/settings.h
 include/freerdp/svc.h
 include/freerdp/types.h
 include/freerdp/update.h
-include/freerdp/utils/args.h
 include/freerdp/utils/bitmap.h
-include/freerdp/utils/blob.h
 include/freerdp/utils/debug.h
-include/freerdp/utils/dsp.h
 include/freerdp/utils/event.h
-include/freerdp/utils/file.h
-include/freerdp/utils/hexdump.h
 include/freerdp/utils/list.h
-include/freerdp/utils/load_plugin.h
-include/freerdp/utils/memory.h
-include/freerdp/utils/mutex.h
+include/freerdp/utils/msusb.h
 include/freerdp/utils/passphrase.h
 include/freerdp/utils/pcap.h
-include/freerdp/utils/print.h
 include/freerdp/utils/profiler.h
 include/freerdp/utils/rail.h
-include/freerdp/utils/rect.h
-include/freerdp/utils/registry.h
-include/freerdp/utils/semaphore.h
 include/freerdp/utils/signal.h
-include/freerdp/utils/sleep.h
 include/freerdp/utils/stopwatch.h
-include/freerdp/utils/stream.h
-include/freerdp/utils/string.h
 include/freerdp/utils/svc_plugin.h
-include/freerdp/utils/thread.h
-include/freerdp/utils/unicode.h
-include/freerdp/utils/wait_obj.h
+include/freerdp/utils/tcp.h
+include/freerdp/utils/time.h
+include/freerdp/utils/uds.h
 include/freerdp/window.h
-%%ALSA%%lib/freerdp/audin_alsa.so
-%%ALSA%%lib/freerdp/tsmf_alsa.so
-%%ALSA%%lib/freerdp/rdpsnd_alsa.so
-%%PULSE%%lib/freerdp/audin_pulse.so
-%%PULSE%%lib/freerdp/rdpsnd_pulse.so
-%%PULSE%%lib/freerdp/tsmf_pulse.so
-%%FFMPEG%%lib/freerdp/tsmf_ffmpeg.so
-lib/freerdp/audin.so
-lib/freerdp/cliprdr.so
-lib/freerdp/disk.so
-lib/freerdp/drdynvc.so
-lib/freerdp/parallel.so
-lib/freerdp/printer.so
-lib/freerdp/rail.so
-lib/freerdp/rdpdbg.so
-lib/freerdp/rdpdr.so
-lib/freerdp/rdpsnd.so
-lib/freerdp/serial.so
-lib/freerdp/tsmf.so
+include/winpr/asn1.h
+include/winpr/bcrypt.h
+include/winpr/cmdline.h
+include/winpr/collections.h
+include/winpr/config.h
+include/winpr/credentials.h
+include/winpr/credui.h
+include/winpr/crt.h
+include/winpr/crypto.h
+include/winpr/dsparse.h
+include/winpr/endian.h
+include/winpr/environment.h
+include/winpr/error.h
+include/winpr/file.h
+include/winpr/handle.h
+include/winpr/heap.h
+include/winpr/input.h
+include/winpr/interlocked.h
+include/winpr/io.h
+include/winpr/library.h
+include/winpr/memory.h
+include/winpr/midl.h
+include/winpr/ndr.h
+include/winpr/ntlm.h
+include/winpr/path.h
+include/winpr/pipe.h
+include/winpr/platform.h
+include/winpr/pool.h
+include/winpr/print.h
+include/winpr/registry.h
+include/winpr/rpc.h
+include/winpr/sam.h
+include/winpr/schannel.h
+include/winpr/security.h
+include/winpr/spec.h
+include/winpr/sspi.h
+include/winpr/sspicli.h
+include/winpr/stream.h
+include/winpr/string.h
+include/winpr/synch.h
+include/winpr/sysinfo.h
+include/winpr/tchar.h
+include/winpr/thread.h
+include/winpr/timezone.h
+include/winpr/windows.h
+include/winpr/winhttp.h
+include/winpr/winpr.h
+include/winpr/winsock.h
+include/winpr/wtypes.h
 lib/libfreerdp-cache.so
-lib/libfreerdp-cache.so.1.0
-lib/libfreerdp-cache.so.1.0.2
-lib/libfreerdp-channels.so
-lib/libfreerdp-channels.so.1.0
-lib/libfreerdp-channels.so.1.0.2
+lib/libfreerdp-cache.so.1.1
+lib/libfreerdp-cache.so.1.1.0
+lib/libfreerdp-client.so
+lib/libfreerdp-client.so.1.1
+lib/libfreerdp-client.so.1.1.0
 lib/libfreerdp-codec.so
-lib/libfreerdp-codec.so.1.0
-lib/libfreerdp-codec.so.1.0.2
+lib/libfreerdp-codec.so.1.1
+lib/libfreerdp-codec.so.1.1.0
+lib/libfreerdp-common.so
+lib/libfreerdp-common.so.1.1.0
+lib/libfreerdp-common.so.1.1.0-beta1
 lib/libfreerdp-core.so
-lib/libfreerdp-core.so.1.0
-lib/libfreerdp-core.so.1.0.2
+lib/libfreerdp-core.so.1.1
+lib/libfreerdp-core.so.1.1.0
+lib/libfreerdp-crypto.so
+lib/libfreerdp-crypto.so.1.1
+lib/libfreerdp-crypto.so.1.1.0
 lib/libfreerdp-gdi.so
-lib/libfreerdp-gdi.so.1.0
-lib/libfreerdp-gdi.so.1.0.2
-lib/libfreerdp-kbd.so
-lib/libfreerdp-kbd.so.1.0
-lib/libfreerdp-kbd.so.1.0.2
+lib/libfreerdp-gdi.so.1.1
+lib/libfreerdp-gdi.so.1.1.0
+lib/libfreerdp-locale.so
+lib/libfreerdp-locale.so.1.1
+lib/libfreerdp-locale.so.1.1.0
+lib/libfreerdp-primitives.so
+lib/libfreerdp-primitives.so.1.1
+lib/libfreerdp-primitives.so.1.1.0
 lib/libfreerdp-rail.so
-lib/libfreerdp-rail.so.1.0
-lib/libfreerdp-rail.so.1.0.2
+lib/libfreerdp-rail.so.1.1
+lib/libfreerdp-rail.so.1.1.0
 lib/libfreerdp-utils.so
-lib/libfreerdp-utils.so.1.0
-lib/libfreerdp-utils.so.1.0.2
+lib/libfreerdp-utils.so.1.1
+lib/libfreerdp-utils.so.1.1.0
+lib/libwinpr-asn1.so
+lib/libwinpr-asn1.so.0.1
+lib/libwinpr-asn1.so.0.1.0
+lib/libwinpr-bcrypt.so
+lib/libwinpr-bcrypt.so.0.1
+lib/libwinpr-bcrypt.so.0.1.0
+lib/libwinpr-credentials.so
+lib/libwinpr-credentials.so.0.1
+lib/libwinpr-credentials.so.0.1.0
+lib/libwinpr-credui.so
+lib/libwinpr-credui.so.0.1
+lib/libwinpr-credui.so.0.1.0
+lib/libwinpr-crt.so
+lib/libwinpr-crt.so.0.1
+lib/libwinpr-crt.so.0.1.0
+lib/libwinpr-crypto.so
+lib/libwinpr-crypto.so.0.1
+lib/libwinpr-crypto.so.0.1.0
+lib/libwinpr-dsparse.so
+lib/libwinpr-dsparse.so.0.1
+lib/libwinpr-dsparse.so.0.1.0
+lib/libwinpr-environment.so
+lib/libwinpr-environment.so.0.1
+lib/libwinpr-environment.so.0.1.0
+lib/libwinpr-error.so
+lib/libwinpr-error.so.0.1
+lib/libwinpr-error.so.0.1.0
+lib/libwinpr-file.so
+lib/libwinpr-file.so.0.1
+lib/libwinpr-file.so.0.1.0
+lib/libwinpr-handle.so
+lib/libwinpr-handle.so.0.1
+lib/libwinpr-handle.so.0.1.0
+lib/libwinpr-heap.so
+lib/libwinpr-heap.so.0.1
+lib/libwinpr-heap.so.0.1.0
+lib/libwinpr-input.so
+lib/libwinpr-input.so.0.1
+lib/libwinpr-input.so.0.1.0
+lib/libwinpr-interlocked.so
+lib/libwinpr-interlocked.so.0.1
+lib/libwinpr-interlocked.so.0.1.0
+lib/libwinpr-io.so
+lib/libwinpr-io.so.0.1
+lib/libwinpr-io.so.0.1.0
+lib/libwinpr-library.so
+lib/libwinpr-library.so.0.1
+lib/libwinpr-library.so.0.1.0
+lib/libwinpr-makecert-tool.a
+lib/libwinpr-path.so
+lib/libwinpr-path.so.0.1
+lib/libwinpr-path.so.0.1.0
+lib/libwinpr-pipe.so
+lib/libwinpr-pipe.so.0.1
+lib/libwinpr-pipe.so.0.1.0
+lib/libwinpr-pool.so
+lib/libwinpr-pool.so.0.1
+lib/libwinpr-pool.so.0.1.0
+lib/libwinpr-registry.so
+lib/libwinpr-registry.so.0.1
+lib/libwinpr-registry.so.0.1.0
+lib/libwinpr-rpc.so
+lib/libwinpr-rpc.so.0.1
+lib/libwinpr-rpc.so.0.1.0
+lib/libwinpr-sspi.so
+lib/libwinpr-sspi.so.0.1
+lib/libwinpr-sspi.so.0.1.0
+lib/libwinpr-sspicli.so
+lib/libwinpr-sspicli.so.0.1
+lib/libwinpr-sspicli.so.0.1.0
+lib/libwinpr-synch.so
+lib/libwinpr-synch.so.0.1
+lib/libwinpr-synch.so.0.1.0
+lib/libwinpr-sysinfo.so
+lib/libwinpr-sysinfo.so.0.1
+lib/libwinpr-sysinfo.so.0.1.0
+lib/libwinpr-thread.so
+lib/libwinpr-thread.so.0.1
+lib/libwinpr-thread.so.0.1.0
+lib/libwinpr-timezone.so
+lib/libwinpr-timezone.so.0.1
+lib/libwinpr-timezone.so.0.1.0
+lib/libwinpr-utils.so
+lib/libwinpr-utils.so.0.1
+lib/libwinpr-utils.so.0.1.0
+lib/libwinpr-winhttp.so
+lib/libwinpr-winhttp.so.0.1
+lib/libwinpr-winhttp.so.0.1.0
+lib/libwinpr-winsock.so
+lib/libwinpr-winsock.so.0.1
+lib/libwinpr-winsock.so.0.1.0
+lib/libxfreerdp-client.so
+lib/libxfreerdp-client.so.1.1
+lib/libxfreerdp-client.so.1.1.0
 libdata/pkgconfig/freerdp.pc
-%%DATADIR%%/keymaps/aliases
-%%DATADIR%%/keymaps/amiga
-%%DATADIR%%/keymaps/ataritt
-%%DATADIR%%/keymaps/digital_vndr/lk
-%%DATADIR%%/keymaps/digital_vndr/pc
-%%DATADIR%%/keymaps/empty
-%%DATADIR%%/keymaps/evdev
-%%DATADIR%%/keymaps/fujitsu
-%%DATADIR%%/keymaps/hp
-%%DATADIR%%/keymaps/ibm
-%%DATADIR%%/keymaps/macintosh
-%%DATADIR%%/keymaps/macosx
-%%DATADIR%%/keymaps/sgi_vndr/indigo
-%%DATADIR%%/keymaps/sgi_vndr/indy
-%%DATADIR%%/keymaps/sgi_vndr/iris
-%%DATADIR%%/keymaps/sony
-%%DATADIR%%/keymaps/sun
-%%DATADIR%%/keymaps/xfree86
-%%DATADIR%%/keymaps/xfree98
-%%DATADIR%%/keymaps/xkb.pl
+man/man1/xfreerdp.1.gz
+@dirrmtry include/winpr
@dirrmtry include/freerdp/utils
+@dirrmtry include/freerdp/server
+@dirrmtry include/freerdp/rail
+@dirrmtry include/freerdp/locale
+@dirrmtry include/freerdp/gdi
+@dirrmtry include/freerdp/crypto
+@dirrmtry include/freerdp/codec
+@dirrmtry include/freerdp/client
@dirrmtry include/freerdp/channels
@dirrmtry include/freerdp/cache
-@dirrmtry include/freerdp/gdi
-@dirrmtry include/freerdp/kbd
-@dirrmtry include/freerdp/rail
-@dirrmtry include/freerdp/codec
-@dirrmtry include/freerdp/plugins
@dirrmtry include/freerdp
-@dirrmtry lib/freerdp
-@dirrmtry %%DATADIR%%/keymaps/digital_vndr
-@dirrmtry %%DATADIR%%/keymaps/sgi_vndr
-@dirrmtry %%DATADIR%%/keymaps
-@dirrmtry %%DATADIR%%
--- a/net/remmina-plugin-gnome/Makefile
+++ b/net/remmina-plugin-gnome/Makefile
@ -10,5 +10,4 @@ LIB_DEPENDS=	gnome-keyring:${PORTSDIR}/security/libgnome-keyring

 MASTERDIR=	${.CURDIR}/../remmina-plugins

-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
--- a/net/remmina-plugin-i18n/Makefile
+++ b/net/remmina-plugin-i18n/Makefile
@ -9,5 +9,4 @@ MASTERDIR=	${.CURDIR}/../remmina-plugins

 USES+=	gettext

-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
--- a/net/remmina-plugin-nx/Makefile
+++ b/net/remmina-plugin-nx/Makefile
@ -10,7 +10,6 @@ USE_XORG+=	xkbfile

 MASTERDIR=	${.CURDIR}/../remmina-plugins

-WITH_NX=	yes
+PLIST_SUB+=	ICONS="" SSH="@comment "

-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
--- a/net/remmina-plugin-rdp/Makefile
+++ b/net/remmina-plugin-rdp/Makefile
@ -10,5 +10,6 @@ RUN_DEPENDS=	${BUILD_DEPENDS}

 MASTERDIR=	${.CURDIR}/../remmina-plugins

-NO_STAGE=	yes
+PLIST_SUB+=	ICONS="" SSH=""
+
 .include "${MASTERDIR}/Makefile"
--- a/net/remmina-plugin-telepathy/Makefile
+++ b/net/remmina-plugin-telepathy/Makefile
@ -5,11 +5,11 @@ PKGNAMESUFFIX=	-telepathy

 COMMENT=	Remmina plugin for Telepathy support

+USE_GNOME+=	gtk30
 LIB_DEPENDS=	telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib

 MASTERDIR=	${.CURDIR}/../remmina-plugins

-WITH_TELEP=	yes
+PLIST_SUB+=	ICONS="@comment "

-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
--- a/net/remmina-plugin-vnc/Makefile
+++ b/net/remmina-plugin-vnc/Makefile
@ -11,5 +11,6 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \

 MASTERDIR=	${.CURDIR}/../remmina-plugins

-NO_STAGE=	yes
+PLIST_SUB+=	ICONS="" SSH=""
+
 .include "${MASTERDIR}/Makefile"
--- a/net/remmina-plugin-xdmcp/Makefile
+++ b/net/remmina-plugin-xdmcp/Makefile
@ -9,5 +9,6 @@ RUN_DEPENDS=	Xephyr:${PORTSDIR}/x11-servers/xephyr

 MASTERDIR=	${.CURDIR}/../remmina-plugins

-NO_STAGE=	yes
+PLIST_SUB+=	ICONS="" SSH=""
+
 .include "${MASTERDIR}/Makefile"
--- a/net/remmina-plugins/Makefile
+++ b/net/remmina-plugins/Makefile
@ -3,6 +3,7 @@

 PORTNAME?=	remmina-plugins
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	net gnome
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeRDP
@ -15,7 +16,6 @@ DISTNAME=	remmina-${PORTVERSION}
 MAINTAINER?=	fluffy@FreeBSD.org
 COMMENT?=	Remmina plugin system

-NO_STAGE=	yes
 .if defined(PKGNAMESUFFIX)
 .include "${.CURDIR}/../remmina-plugins/bsd.plugin.mk"
 .else
--- a/net/remmina-plugins/bsd.plugin.mk
+++ b/net/remmina-plugins/bsd.plugin.mk
@ -1,9 +1,9 @@
 .if defined(PKGNAMESUFFIX)

 PORTNAME=	remmina-plugin
+PATCHDIR=	${.CURDIR}/../remmina/files

 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/${PORTNAME}s/COPYING

 BUILD_DEPENDS+=	remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina
 RUN_DEPENDS+=	remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina
@ -23,6 +23,25 @@ CMAKE_ARGS+=    --build=build
 # prefer gtk2 rather than gtk3
 CMAKE_ARGS+=    -DGTK_VERSION=2

+SSH_DESC=	Build with SSH tunneling support
+
+.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
+
+.if ${PORT_OPTIONS:MNLS}
+RUN_DEPENDS+=	${LOCALBASE}/share/locale/bg/LC_MESSAGES/remmina-plugins.mo:${PORTSDIR}/net/remmina-plugin-i18n
+.endif
+
 .include <bsd.port.pre.mk>

 .if ${PKGNAMESUFFIX} == "-i18n" || ${PKGNAMESUFFIX} == "-gnome"
@ -30,31 +49,6 @@ PLIST=		${.CURDIR}/pkg-plist
 .else
 PLIST_SUB+=	PLUGIN="${PKGNAMESUFFIX:S,-,,}"
 PLIST=		${PKGDIR}/pkg-plist.plugin
-
-.if ${PORT_OPTIONS:MTELEP}
-PLIST_SUB+=	TELEP="" ICONS="@comment "
-.else
-PLIST_SUB+=	TELEP="@comment " ICONS=""
-.endif
-.if ${PORT_OPTIONS:MTELEP}
-LIB_DEPENDS+=	ssh.4:${PORTSDIR}/security/libssh
-PLIST_SUB+=	SSH="@comment "
-.if ${OSVERSION} >= 800040
-LDFLAGS+=	-fstack-protector
-.endif
-.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
-.endif
-
 .endif

 post-patch:
@ -76,7 +70,7 @@ post-patch:
 .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|find_required_package(LIBVNCSERVER)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|add_subdirectory(vnc)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
 .endif
 .if ${PKGNAMESUFFIX:S,-,,} != "xdmcp"
--- a/net/remmina-plugins/pkg-plist.plugin
+++ b/net/remmina-plugins/pkg-plist.plugin
@ -1,15 +1,8 @@
 lib/remmina/plugins/remmina-plugin-%%PLUGIN%%.so
-%%ICONS%%%%SSH%%share/remmina/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%-ssh.png
-%%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
-@dirrmtry share/remmina/icons/hicolor/16x16
-@dirrmtry share/remmina/icons/hicolor
-@dirrmtry share/remmina/icons
-@dirrmtry share/remmina
+%%ICONS%%%%SSH%%share/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%-ssh.png
+%%ICONS%%share/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%.png
+%%ICONS%%%%SSH%%share/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%-ssh.png
+%%ICONS%%share/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%.png
@dirrmtry lib/remmina/plugins
@dirrmtry lib/remmina
@dirrmtry include/remmina
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@ -3,19 +3,19 @@

 PORTNAME=	remmina
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	net gnome

 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	The GTK+ Remote Desktop Client

 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/${PORTNAME}/COPYING

 USES=		cmake desktop-file-utils gmake pkgconfig
 USE_GNOME=	atk gdkpixbuf2 glib20 gtk20 pango
 INSTALLS_ICONS=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -Wl,-rpath -Wl,${LOCALBASE}/lib -lX11 \
-		-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lgmodule-2.0
+		-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lgmodule-2.0 -lgtk-x11-2.0
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 CFLAGS+=	-I${WRKSRC}/remmina/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC
 SUB_FILES=	pkg-message
@ -34,7 +34,6 @@ TERM_DESC=	Build with terminal support
 AVAHI_DESC=	Build with Avahi support
 UNIQUE_DESC=	Build with Unique-App support

-NO_STAGE=	yes
 .include <bsd.port.options.mk>

 CMAKE_ARGS+=	--build=build
@ -50,8 +49,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif

 .if ${PORT_OPTIONS:MSSH}
-BUILD_DEPENDS+=	${LOCALBASE}/include/libssh/libssh.h:${PORTSDIR}/security/libssh
-RUN_DEPENDS+=	${LOCALBASE}/lib/libssh.so.4:${PORTSDIR}/security/libssh
+LIB_DEPENDS+=	libssh.so:${PORTSDIR}/security/libssh
 .if ${OSVERSION} >= 800040
 LDFLAGS+=	-fstack-protector
 .endif
@ -60,7 +58,7 @@ CMAKE_ARGS+=	-DWITH_LIBSSH=OFF
 .endif

 .if ${PORT_OPTIONS:MGCRYPT}
-LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
 .else
 CMAKE_ARGS+=	-DWITH_GCRYPT=OFF
 .endif
@ -72,32 +70,29 @@ CMAKE_ARGS+=	-DWITH_VTE=OFF
 .endif

 .if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	avahi-ui:${PORTSDIR}/net/avahi-gtk
+LIB_DEPENDS+=	libavahi-ui.so:${PORTSDIR}/net/avahi-gtk
 .else
 CMAKE_ARGS+=	-DWITH_AVAHI=OFF
 .endif

 .if ${PORT_OPTIONS:MUNIQUE}
-LIB_DEPENDS+=	unique:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS+=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
 .else
 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
+	# fix pkgconfig
+	${REINPLACE_CMD} -e 's,$${CMAKE_INSTALL_LIBDIR}/pkgconfig,libdata/pkgconfig,' ${WRKSRC}/remmina/CMakeLists.txt
+	# 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
+	${REINPLACE_CMD} -e's|add_subdirectory(external_tools)||' ${WRKSRC}/remmina/CMakeLists.txt
 .if !${PORT_OPTIONS:MNLS}
 	${REINPLACE_CMD} -e's|add_subdirectory(po)||' ${WRKSRC}/remmina/CMakeLists.txt
 .endif

 post-install:
-	@# localized desktop entry file is not included remmina 1.0.0, install manually
-	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications/
-	${CP} -a ${DATADIR}/icons/ ${PREFIX}/share/icons
 	@${CAT} ${PKGMESSAGE}

 .include <bsd.port.mk>
--- a/net/remmina/files/patch-FreeRDP-Remmina-b6a55ae
+++ b/net/remmina/files/patch-FreeRDP-Remmina-b6a55ae
--- a/net/remmina/files/patch-remmina_CMakeFiles.txt
+++ b/net/remmina/files/patch-remmina_CMakeFiles.txt
@ -1,9 +0,0 @@
--- 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)
- 
--- a/net/remmina/files/remmina.desktop
+++ b/net/remmina/files/remmina.desktop
@ -1,61 +0,0 @@
-[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;
-
--- a/net/remmina/pkg-plist
+++ b/net/remmina/pkg-plist
@ -1,86 +1,49 @@
 bin/remmina
 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/16x16/actions/remmina-fit-window.png
+share/icons/hicolor/16x16/actions/remmina-fullscreen.png
+share/icons/hicolor/16x16/actions/remmina-pin-down.png
+share/icons/hicolor/16x16/actions/remmina-pin-up.png
+share/icons/hicolor/16x16/actions/remmina-scale.png
+share/icons/hicolor/16x16/actions/remmina-switch-page.png
+share/icons/hicolor/16x16/apps/remmina.png
+share/icons/hicolor/16x16/emblems/remmina-sftp.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/actions/remmina-switch-page.png
+share/icons/hicolor/22x22/apps/remmina.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
+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
 %%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/ca/LC_MESSAGES/remmina.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/nl/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
-%%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-scale.png
-%%DATADIR%%/icons/hicolor/16x16/actions/remmina-pin-up.png
-%%DATADIR%%/icons/hicolor/16x16/actions/remmina-switch-page.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/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
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@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
-@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 include/remmina